From 25c5ced2054a9be81ae51422482fe709f6f940c0 Mon Sep 17 00:00:00 2001
From: Kalle Valo <kvalo@qca.qualcomm.com>
Date: Tue, 13 Sep 2011 10:21:25 +0300
Subject: [PATCH] --- yaml --- r: 266083 b: refs/heads/master c:
 12e62d6f7ec475e546b40bece2045da15d6c21ef h: refs/heads/master i:   266081:
 308beaf5fcef53baa91d765baa3f8af89700c1ac   266079:
 b712b779b9ec3b9bf320333b1fa638a96130d697 v: v3

---
 [refs]            |  2 +-
 trunk/MAINTAINERS | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 711ce9d97478..4052ef70b657 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7107676a3a46415c27186bc7d5ce988498897c66
+refs/heads/master: 12e62d6f7ec475e546b40bece2045da15d6c21ef
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index c66c093978d7..ce0e60c7b07a 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -1246,6 +1246,14 @@ W:	http://wireless.kernel.org/en/users/Drivers/ath5k
 S:	Maintained
 F:	drivers/net/wireless/ath/ath5k/
 
+ATHEROS ATH6KL WIRELESS DRIVER
+M:	Kalle Valo <kvalo@qca.qualcomm.com>
+L:	linux-wireless@vger.kernel.org
+W:	http://wireless.kernel.org/en/users/Drivers/ath6kl
+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath6kl.git
+S:	Supported
+F:	drivers/net/wireless/ath/ath6kl/
+
 ATHEROS ATH9K WIRELESS DRIVER
 M:	"Luis R. Rodriguez" <mcgrof@qca.qualcomm.com>
 M:	Jouni Malinen <jouni@qca.qualcomm.com>
@@ -6122,12 +6130,6 @@ M:	Jakub Schmidtke <sjakub@gmail.com>
 S:	Odd Fixes
 F:	drivers/staging/asus_oled/
 
-STAGING - ATHEROS ATH6KL WIRELESS DRIVER
-M:	Luis R. Rodriguez <mcgrof@gmail.com>
-M:	Naveen Singh <nsingh@atheros.com>
-S:	Odd Fixes
-F:	drivers/staging/ath6kl/
-
 STAGING - COMEDI
 M:	Ian Abbott <abbotti@mev.co.uk>
 M:	Mori Hess <fmhess@users.sourceforge.net>