From d2b9970c6345692aee94e71f3dbe5527406ab13e Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Fri, 9 Dec 2011 00:12:52 -0800
Subject: [PATCH] --- yaml --- r: 281344 b: refs/heads/master c:
 f62ebdd581ea4c18328b71eb371354390cd73d56 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 926393fcc8a1..5eb4be718dae 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d518802172427077f9ca0919dfaa8f285c62cdd
+refs/heads/master: f62ebdd581ea4c18328b71eb371354390cd73d56
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index 80454dd0d913..7027362c3ee8 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -1589,7 +1589,7 @@ M:	Franky (Zhenhui) Lin <frankyl@broadcom.com>
 M:	Kan Yan	<kanyan@broadcom.com>
 L:	linux-wireless@vger.kernel.org
 S:	Supported
-F:	drivers/staging/brcm80211/
+F:	drivers/net/wireless/brcm80211/
 
 BROADCOM BNX2FC 10 GIGABIT FCOE DRIVER
 M:	Bhanu Prakash Gollapudi <bprakash@broadcom.com>