Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[deliverable/linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index c69547059ef32d66ee92f4b0b99714cf43f27db2..dc226e78612c7e6a39fb193fac3cef4b70f75754 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -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
@@ -5479,6 +5479,7 @@ STAGING SUBSYSTEM
 P:     Greg Kroah-Hartman
 M:     gregkh@suse.de
 T:     quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
+L:     devel@driverdev.osuosl.org
 S:     Maintained
 F:     drivers/staging/