diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-09-21 15:49:14 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-09-21 15:49:14 -0400 |
| commit | b618f6f885579a6237e5bf4582fa6167972ddef4 (patch) | |
| tree | b11508178570b98ce9cb2d76ecebd046a6f0e77c /MAINTAINERS | |
| parent | 462fb2af9788a82a534f8184abfde31574e1cfa0 (diff) | |
| parent | 6e5c2b4e8addfaab8ef54dedaf7b607e1585c35b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
arch/arm/mach-omap2/board-omap3pandora.c
drivers/net/wireless/ath/ath5k/base.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 102352e6d61..017bf493166 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1120,6 +1120,13 @@ W: http://wireless.kernel.org/en/users/Drivers/ar9170 S: Maintained F: drivers/net/wireless/ath/ar9170/ +CARL9170 LINUX COMMUNITY WIRELESS DRIVER +M: Christian Lamparter <chunkeey@googlemail.com> +L: linux-wireless@vger.kernel.org +W: http://wireless.kernel.org/en/users/Drivers/carl9170 +S: Maintained +F: drivers/net/wireless/ath/carl9170/ + ATK0110 HWMON DRIVER M: Luca Tettamanti <kronos.it@gmail.com> L: lm-sensors@lm-sensors.org @@ -6427,7 +6434,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 +F: include/linux/wl12xx.h WL3501 WIRELESS PCMCIA CARD DRIVER M: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> |