diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-09-02 13:30:07 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-09-02 13:30:07 -0400 |
| commit | 78ab952717b62c0ba6ca7f7a27eaa0486685e45f (patch) | |
| tree | a4ab2bfc578f279fc6847031f501d84c75057531 /MAINTAINERS | |
| parent | 3e502e63586920f219ed2590f69c1f5a8888cfa4 (diff) | |
| parent | 85f72bc839705294b32b6c16b491c0422f0a71b3 (diff) | |
| download | talos-obmc-linux-78ab952717b62c0ba6ca7f7a27eaa0486685e45f.tar.gz talos-obmc-linux-78ab952717b62c0ba6ca7f7a27eaa0486685e45f.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 93198c1980a9..7a49a7b5af1d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4304,13 +4304,12 @@ F: Documentation/filesystems/dlmfs.txt F: fs/ocfs2/ ORINOCO DRIVER -M: Pavel Roskin <proski@gnu.org> -M: David Gibson <hermes@gibson.dropbear.id.au> L: linux-wireless@vger.kernel.org L: orinoco-users@lists.sourceforge.net L: orinoco-devel@lists.sourceforge.net +W: http://linuxwireless.org/en/users/Drivers/orinoco W: http://www.nongnu.org/orinoco/ -S: Maintained +S: Orphan F: drivers/net/wireless/orinoco/ OSD LIBRARY and FILESYSTEM @@ -6376,7 +6375,7 @@ S: Maintained F: drivers/input/misc/wistron_btns.c WL1251 WIRELESS DRIVER -M: Kalle Valo <kalle.valo@iki.fi> +M: Kalle Valo <kvalo@adurom.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 @@ -6391,6 +6390,7 @@ W: http://wireless.kernel.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git S: Maintained F: drivers/net/wireless/wl12xx/wl1271* +F: include/linux/spi/wl12xx.h WL3501 WIRELESS PCMCIA CARD DRIVER M: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> |
