Merge branch 'for-3.6' of git://gitorious.org/linux-pwm/linux-pwm

[~andy/linux] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index cd8a3f61a79c9649fcbb05f4c4dca831cc29d3a9..b141083b26211f349462408d6b0bd099b1bb0c7f 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -242,13 +242,6 @@ W: http://www.lesswatts.org/projects/acpi/
 S:     Supported
 F:     drivers/acpi/fan.c
 
-ACPI PROCESSOR AGGREGATOR DRIVER
-M:     Shaohua Li <shaohua.li@intel.com>
-L:     linux-acpi@vger.kernel.org
-W:     http://www.lesswatts.org/projects/acpi/
-S:     Supported
-F:     drivers/acpi/acpi_pad.c
-
 ACPI THERMAL DRIVER
 M:     Zhang Rui <rui.zhang@intel.com>
 L:     linux-acpi@vger.kernel.org
@@ -1193,6 +1186,17 @@ S:       Maintained
 F:     arch/arm/mach-pxa/vpac270.c
 F:     arch/arm/mach-pxa/include/mach/vpac270.h
 
+ARM/VT8500 ARM ARCHITECTURE
+M:     Tony Prisk <linux@prisktech.co.nz>
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:     Maintained
+F:     arch/arm/mach-vt8500/
+F:     drivers/video/vt8500lcdfb.*
+F:     drivers/video/wm8505fb*
+F:     drivers/video/wmt_ge_rops.*
+F:     drivers/tty/serial/vt8500_serial.c
+F:     drivers/rtc/rtc-vt8500-c
+
 ARM/ZIPIT Z2 SUPPORT
 M:     Marek Vasut <marek.vasut@gmail.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1536,6 +1540,11 @@ W:       http://blackfin.uclinux.org/
 S:     Supported
 F:     drivers/i2c/busses/i2c-bfin-twi.c
 
+BLINKM RGB LED DRIVER
+M:     Jan-Simon Moeller <jansimon.moeller@gmx.de>
+S:     Maintained
+F:     drivers/leds/leds-blinkm.c
+
 BLOCK LAYER
 M:     Jens Axboe <axboe@kernel.dk>
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
@@ -2728,6 +2737,14 @@ M:       Mimi Zohar <zohar@us.ibm.com>
 S:     Supported
 F:     security/integrity/evm/
 
+EXTERNAL CONNECTOR SUBSYSTEM (EXTCON)
+M:     MyungJoo Ham <myungjoo.ham@samsung.com>
+M:     Chanwoo Choi <cw00.choi@samsung.com>
+L:     linux-kernel@vger.kernel.org
+S:     Maintained
+F:     drivers/extcon/
+F:     Documentation/extcon/
+
 EXYNOS DP DRIVER
 M:     Jingoo Han <jg1.han@samsung.com>
 L:     linux-fbdev@vger.kernel.org
@@ -4953,6 +4970,13 @@ S:       Maintained
 F:     drivers/usb/*/*omap*
 F:     arch/arm/*omap*/usb*
 
+OMAP GPIO DRIVER
+M:     Santosh Shilimkar <santosh.shilimkar@ti.com>
+M:     Kevin Hilman <khilman@ti.com>
+L:     linux-omap@vger.kernel.org
+S:     Maintained
+F:     drivers/gpio/gpio-omap.c
+
 OMFS FILESYSTEM
 M:     Bob Copeland <me@bobcopeland.com>
 L:     linux-karma-devel@lists.sourceforge.net
@@ -5502,6 +5526,18 @@ S:       Maintained
 F:     Documentation/video4linux/README.pvrusb2
 F:     drivers/media/video/pvrusb2/
 
+PWM SUBSYSTEM
+M:     Thierry Reding <thierry.reding@avionic-design.de>
+L:     linux-kernel@vger.kernel.org
+S:     Maintained
+W:     http://gitorious.org/linux-pwm
+T:     git git://gitorious.org/linux-pwm/linux-pwm.git
+F:     Documentation/pwm.txt
+F:     Documentation/devicetree/bindings/pwm/
+F:     include/linux/pwm.h
+F:     include/linux/of_pwm.h
+F:     drivers/pwm/
+
 PXA2xx/PXA3xx SUPPORT
 M:     Eric Miao <eric.y.miao@gmail.com>
 M:     Russell King <linux@arm.linux.org.uk>
@@ -5717,6 +5753,7 @@ F:        include/linux/regmap.h
 
 REMOTE PROCESSOR (REMOTEPROC) SUBSYSTEM
 M:     Ohad Ben-Cohen <ohad@wizery.com>
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git
 S:     Maintained
 F:     drivers/remoteproc/
 F:     Documentation/remoteproc.txt
@@ -7605,7 +7642,9 @@ W:        http://opensource.wolfsonmicro.com/content/linux-drivers-wolfson-devices
 S:     Supported
 F:     Documentation/hwmon/wm83??
 F:     arch/arm/mach-s3c64xx/mach-crag6410*
+F:     drivers/clk/clk-wm83*.c
 F:     drivers/leds/leds-wm83*.c
+F:     drivers/gpio/gpio-*wm*.c
 F:     drivers/hwmon/wm83??-hwmon.c
 F:     drivers/input/misc/wm831x-on.c
 F:     drivers/input/touchscreen/wm831x-ts.c