Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

Conflicts:
	drivers/net/wireless/ath/ar9170/main.c
	drivers/net/wireless/ath/ar9170/phy.c
	drivers/net/wireless/zd1211rw/zd_rf_rf2959.c

1 files changed, 6 insertions, 7 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 649600cb8ec9..e1b056333b57 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1224,13 +1224,6 @@ W:	http://wireless.kernel.org/en/users/Drivers/ath9k
 S:      Supported
 F:      drivers/net/wireless/ath/ath9k/
 
-ATHEROS AR9170 WIRELESS DRIVER
-M:      Christian Lamparter <chunkeey@web.de>
-L:      linux-wireless@vger.kernel.org
-W:      http://wireless.kernel.org/en/users/Drivers/ar9170
-S:      Obsolete
-F:      drivers/net/wireless/ath/ar9170/
-
 CARL9170 LINUX COMMUNITY WIRELESS DRIVER
 M:      Christian Lamparter <chunkeey@googlemail.com>
 L:      linux-wireless@vger.kernel.org
@@ -3355,6 +3348,12 @@ F:	Documentation/wimax/README.i2400m
 F:      drivers/net/wimax/i2400m/
 F:      include/linux/wimax/i2400m.h
 
+INTEL WIRELESS 3945ABG/BG, 4965AGN (iwlegacy)
+M:      Stanislaw Gruszka <sgruszka@redhat.com>
+L:      linux-wireless@vger.kernel.org
+S:      Supported
+F:      drivers/net/wireless/iwlegacy/
+
 INTEL WIRELESS WIFI LINK (iwlwifi)
 M:      Wey-Yi Guy <wey-yi.w.guy@intel.com>
 M:      Intel Linux Wireless <ilw@linux.intel.com>