includecheck fix: include/linux, aio.h

[safe/jmp/linux-2.6] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index fba5e81..43761a0 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -931,6 +931,12 @@ W: http://wireless.kernel.org/en/users/Drivers/ar9170
 S:     Maintained
 F:     drivers/net/wireless/ath/ar9170/
 
+ATK0110 HWMON DRIVER
+M:     Luca Tettamanti <kronos.it@gmail.com>
+L:     lm-sensors@lm-sensors.org
+S:     Maintained
+F:     drivers/hwmon/asus_atk0110.c
+
 ATI_REMOTE2 DRIVER
 M:     Ville Syrjala <syrjala@sci.fi>
 S:     Maintained
@@ -1967,7 +1973,6 @@ F:        fs/ext2/
 F:     include/linux/ext2*
 
 EXT3 FILE SYSTEM
-M:     Stephen Tweedie <sct@redhat.com>
 M:     Andrew Morton <akpm@linux-foundation.org>
 M:     Andreas Dilger <adilger@sun.com>
 L:     linux-ext4@vger.kernel.org
@@ -2152,13 +2157,16 @@ F:      Documentation/filesystems/caching/
 F:     fs/fscache/
 F:     include/linux/fscache*.h
 
-FTRACE
+TRACING
 M:     Steven Rostedt <rostedt@goodmis.org>
+M:     Frederic Weisbecker <fweisbec@gmail.com>
+M:     Ingo Molnar <mingo@redhat.com>
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git tracing/core
 S:     Maintained
 F:     Documentation/trace/ftrace.txt
 F:     arch/*/*/*/ftrace.h
 F:     arch/*/kernel/ftrace.c
-F:     include/*/ftrace.h
+F:     include/*/ftrace.h include/trace/ include/linux/trace*.h
 F:     kernel/trace/
 
 FUJITSU FR-V (FRV) PORT
@@ -2892,8 +2900,8 @@ F:        fs/jffs2/
 F:     include/linux/jffs2.h
 
 JOURNALLING LAYER FOR BLOCK DEVICES (JBD)
-M:     Stephen Tweedie <sct@redhat.com>
 M:     Andrew Morton <akpm@linux-foundation.org>
+M:     Jan Kara <jack@suse.cz>
 L:     linux-ext4@vger.kernel.org
 S:     Maintained
 F:     fs/jbd*/
@@ -4446,6 +4454,14 @@ S:       Maintained
 F:     kernel/sched*
 F:     include/linux/sched.h
 
+SCORE ARCHITECTURE
+P:     Chen Liqin
+M:     liqin.chen@sunplusct.com
+P:     Lennox Wu
+M:     lennox.wu@sunplusct.com
+W:     http://www.sunplusct.com
+S:     Supported
+
 SCSI CDROM DRIVER
 M:     Jens Axboe <axboe@kernel.dk>
 L:     linux-scsi@vger.kernel.org
@@ -4645,6 +4661,12 @@ F:       arch/arm/mach-s3c2410/
 F:     drivers/*/*s3c2410*
 F:     drivers/*/*/*s3c2410*
 
+TI DAVINCI MACHINE SUPPORT
+P:     Kevin Hilman
+M:     davinci-linux-open-source@linux.davincidsp.com
+S:     Supported
+F:     arch/arm/mach-davinci
+
 SIS 190 ETHERNET DRIVER
 M:     Francois Romieu <romieu@fr.zoreil.com>
 L:     netdev@vger.kernel.org
@@ -5681,7 +5703,9 @@ F:        drivers/mfd/wm8*.c
 F:     drivers/power/wm83*.c
 F:     drivers/rtc/rtc-wm83*.c
 F:     drivers/regulator/wm8*.c
+F:     drivers/video/backlight/wm83*_bl.c
 F:     drivers/watchdog/wm83*_wdt.c
+F:     include/linux/mfd/wm831x/
 F:     include/linux/mfd/wm8350/
 F:     include/linux/mfd/wm8400/
 F:     sound/soc/codecs/wm8350.c
@@ -5719,7 +5743,7 @@ F:        include/xen/
 
 XFS FILESYSTEM
 P:     Silicon Graphics Inc
-M:     Felix Blyakher <felixb@sgi.com>
+M:     Alex Elder <aelder@sgi.com>
 M:     xfs-masters@oss.sgi.com
 L:     xfs@oss.sgi.com
 W:     http://oss.sgi.com/projects/xfs