1 files changed, 8 insertions, 8 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 1e14f7b70f2f..dc226e78612c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -946,7 +946,7 @@ M:	me@bobcopeland.com
 L:      linux-wireless@vger.kernel.org
 L:      ath5k-devel@lists.ath5k.org
 S:      Maintained
-F:      drivers/net/wireless/ath5k/
+F:      drivers/net/wireless/ath/ath5k/
 
 ATHEROS ATH9K WIRELESS DRIVER
 P:      Luis R. Rodriguez
@@ -962,7 +962,7 @@ M:	senthilkumar@atheros.com
 L:      linux-wireless@vger.kernel.org
 L:      ath9k-devel@lists.ath9k.org
 S:      Supported
-F:      drivers/net/wireless/ath9k/
+F:      drivers/net/wireless/ath/ath9k/
 
 ATHEROS AR9170 WIRELESS DRIVER
 P:      Christian Lamparter
@@ -970,7 +970,7 @@ M:	chunkeey@web.de
 L:      linux-wireless@vger.kernel.org
 W:      http://wireless.kernel.org/en/users/Drivers/ar9170
 S:      Maintained
-F:      drivers/net/wireless/ar9170/
+F:      drivers/net/wireless/ath/ar9170/
 
 ATI_REMOTE2 DRIVER
 P:      Ville Syrjala
@@ -2053,8 +2053,8 @@ F:	drivers/edac/i5400_edac.c
 
 EDAC-I82975X
 P:      Ranganathan Desikan
-P:      Arvind R.
 M:      rdesikan@jetzbroadband.com
+P:      Arvind R.
 M:      arvind@acarlab.com
 L:      bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:      bluesmoke.sourceforge.net
@@ -2390,7 +2390,7 @@ FTRACE
 P:      Steven Rostedt
 M:      rostedt@goodmis.org
 S:      Maintained
-F:      Documentation/ftrace.txt
+F:      Documentation/trace/ftrace.txt
 F:      arch/*/*/*/ftrace.h
 F:      arch/*/kernel/ftrace.c
 F:      include/*/ftrace.h
@@ -2849,7 +2849,7 @@ W:	http://apps.sourceforge.net/trac/linux-zigbee
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/lumag/lowpan.git
 S:      Maintained
 F:      net/ieee802154/
-F:      drivers/ieee801254/
+F:      drivers/ieee802154/
 
 INTEGRITY MEASUREMENT ARCHITECTURE (IMA)
 P:      Mimi Zohar
@@ -3406,7 +3406,7 @@ P:	Eduard - Gabriel Munteanu
 M:      eduard.munteanu@linux360.ro
 S:      Maintained
 F:      Documentation/trace/kmemtrace.txt
-F:      include/trace/kmemtrace.h
+F:      include/linux/kmemtrace.h
 F:      kernel/trace/kmemtrace.c
 
 KPROBES
@@ -4083,7 +4083,7 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git
 S:      Maintained
 F:      net/wireless/
 F:      include/net/ieee80211*
-F:      include/net/wireless.h
+F:      include/linux/wireless.h
 
 NETWORKING DRIVERS
 L:      netdev@vger.kernel.org