diff options
| author | David S. Miller <davem@davemloft.net> | 2010-10-08 13:51:11 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-08 13:51:11 -0700 |
| commit | 9cf8d1a3b8cb19fa49494c1b8f0f9e3a37f2c218 (patch) | |
| tree | 0e9262488832ad27f6ba42680bf104872fa3c697 /MAINTAINERS | |
| parent | 8391d07b80e8da957cd888870e23f8e218438622 (diff) | |
| parent | e9a68707d736f4f73d7e209885d7b4c5c452b1dc (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index e967aadddfc6..296c3d7cdb50 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6457,7 +6457,7 @@ WL1271 WIRELESS DRIVER M: Luciano Coelho <luciano.coelho@nokia.com> L: linux-wireless@vger.kernel.org W: http://wireless.kernel.org -T: git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx.git S: Maintained F: drivers/net/wireless/wl12xx/wl1271* F: include/linux/wl12xx.h |