Merge branch 'linus' into sfi-release

[safe/jmp/linux-2.6] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index e2b9486..81061c3 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4454,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
@@ -4638,6 +4646,18 @@ L:       linux-pci@vger.kernel.org
 S:     Supported
 F:     drivers/pci/hotplug/shpchp*
 
+SIMPLE FIRMWARE INTERFACE (SFI)
+P:     Len Brown
+M:     lenb@kernel.org
+L:     sfi-devel@simplefirmware.org
+W:     http://simplefirmware.org/
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6.git
+S:     Supported
+F:     arch/x86/kernel/*sfi*
+F:     drivers/sfi/
+F:     include/linux/sfi*.h
+
+
 SIMTEC EB110ATX (Chalice CATS)
 P:     Ben Dooks
 M:     Vincent Sanders <support@simtec.co.uk>
@@ -5683,6 +5703,26 @@ S:       Supported
 F:     drivers/input/touchscreen/*wm97*
 F:     include/linux/wm97xx.h
 
+WOLFSON MICROELECTRONICS PMIC DRIVERS
+P:     Mark Brown
+M:     broonie@opensource.wolfsonmicro.com
+L:     linux-kernel@vger.kernel.org
+T:     git git://opensource.wolfsonmicro.com/linux-2.6-audioplus
+W:     http://opensource.wolfsonmicro.com/node/8
+S:     Supported
+F:     drivers/leds/leds-wm83*.c
+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
+F:     sound/soc/codecs/wm8400.c
+
 X.25 NETWORK LAYER
 M:     Henner Eisen <eis@baty.hanse.de>
 L:     linux-x25@vger.kernel.org