Merge branch 'for-linus-merged' of master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6-omap-h63xx.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index d072a0aead799acb2b6de3ba581acb88daa2404c..5084539347f13ece508940fdfe06781d2752fb6f 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -725,6 +725,15 @@ L: linux-wireless@vger.kernel.org
 L:     ath5k-devel@lists.ath5k.org
 S:     Maintained
 
+ATHEROS ATH9K WIRELESS DRIVER
+P:     Luis R. Rodriguez
+M:     lrodriguez@atheros.com
+P:     Jouni Malinen
+M:     jmalinen@atheros.com
+L:     linux-wireless@vger.kernel.org
+L:     ath9k-devel@lists.ath9k.org
+S:     Supported
+
 ATI_REMOTE2 DRIVER
 P:     Ville Syrjala
 M:     syrjala@sci.fi