Merge tag 'staging-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[cascardo/linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 89e9991..15b4c41 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -238,6 +238,12 @@ L: lm-sensors@lm-sensors.org
 S:     Maintained
 F:     drivers/hwmon/abituguru3.c
 
+ACCES 104-DIO-48E GPIO DRIVER
+M:     William Breathitt Gray <vilhelm.gray@gmail.com>
+L:     linux-gpio@vger.kernel.org
+S:     Maintained
+F:     drivers/gpio/gpio-104-dio-48e.c
+
 ACCES 104-IDI-48 GPIO DRIVER
 M:     "William Breathitt Gray" <vilhelm.gray@gmail.com>
 L:     linux-gpio@vger.kernel.org
@@ -769,6 +775,12 @@ L: alsa-devel@alsa-project.org (moderated for non-subscribers)
 S:     Maintained
 F:     sound/aoa/
 
+APEX EMBEDDED SYSTEMS STX104 DAC DRIVER
+M:     William Breathitt Gray <vilhelm.gray@gmail.com>
+L:     linux-iio@vger.kernel.org
+S:     Maintained
+F:     drivers/iio/dac/stx104.c
+
 APM DRIVER
 M:     Jiri Kosina <jikos@kernel.org>
 S:     Odd fixes
@@ -1956,6 +1968,12 @@ M:       Nicolas Ferre <nicolas.ferre@atmel.com>
 S:     Supported
 F:     drivers/tty/serial/atmel_serial.c
 
+ATMEL SAMA5D2 ADC DRIVER
+M:     Ludovic Desroches <ludovic.desroches@atmel.com>
+L:     linux-iio@vger.kernel.org
+S:     Supported
+F:     drivers/iio/adc/at91-sama5d2_adc.c
+
 ATMEL Audio ALSA driver
 M:     Nicolas Ferre <nicolas.ferre@atmel.com>
 L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
@@ -3542,13 +3560,6 @@ L:       driverdev-devel@linuxdriverproject.org
 S:     Maintained
 F:     drivers/staging/dgnc/
 
-DIGI EPCA PCI PRODUCTS
-M:     Lidza Louina <lidza.louina@gmail.com>
-M:     Daeseok Youn <daeseok.youn@gmail.com>
-L:     driverdev-devel@linuxdriverproject.org
-S:     Maintained
-F:     drivers/staging/dgap/
-
 DIOLAN U2C-12 I2C DRIVER
 M:     Guenter Roeck <linux@roeck-us.net>
 L:     linux-i2c@vger.kernel.org
@@ -4827,10 +4838,14 @@ L:      linux-gpio@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git
 S:     Maintained
 F:     Documentation/gpio/
+F:     Documentation/ABI/testing/gpio-cdev
+F:     Documentation/ABI/obsolete/sysfs-gpio
 F:     drivers/gpio/
 F:     include/linux/gpio/
 F:     include/linux/gpio.h
 F:     include/asm-generic/gpio.h
+F:     include/uapi/linux/gpio.h
+F:     tools/gpio/
 
 GRE DEMULTIPLEXER DRIVER
 M:     Dmitry Kozlov <xeb@mail.ru>
@@ -5571,6 +5586,7 @@ F:        drivers/input/
 F:     include/linux/input.h
 F:     include/uapi/linux/input.h
 F:     include/linux/input/
+F:     Documentation/devicetree/bindings/input/
 
 INPUT MULTITOUCH (MT) PROTOCOL
 M:     Henrik Rydberg <rydberg@bitmath.org>
@@ -6586,9 +6602,10 @@ F:       drivers/platform/x86/hp_accel.c
 
 LIVE PATCHING
 M:     Josh Poimboeuf <jpoimboe@redhat.com>
-M:     Seth Jennings <sjenning@redhat.com>
+M:     Jessica Yu <jeyu@redhat.com>
 M:     Jiri Kosina <jikos@kernel.org>
-M:     Vojtech Pavlik <vojtech@suse.com>
+M:     Miroslav Benes <mbenes@suse.cz>
+R:     Petr Mladek <pmladek@suse.com>
 S:     Maintained
 F:     kernel/livepatch/
 F:     include/linux/livepatch.h
@@ -8190,6 +8207,13 @@ S:       Maintained
 F:     Documentation/mn10300/
 F:     arch/mn10300/
 
+PARALLEL LCD/KEYPAD PANEL DRIVER
+M:      Willy Tarreau <willy@haproxy.com>
+M:      Ksenija Stanojevic <ksenija.stanojevic@gmail.com>
+S:      Odd Fixes
+F:      Documentation/misc-devices/lcd-panel-cgram.txt
+F:      drivers/misc/panel.c
+
 PARALLEL PORT SUBSYSTEM
 M:     Sudip Mukherjee <sudipm.mukherjee@gmail.com>
 M:     Sudip Mukherjee <sudip@vectorindia.org>
@@ -10443,19 +10467,6 @@ L:     linux-tegra@vger.kernel.org
 S:     Maintained
 F:     drivers/staging/nvec/
 
-STAGING - OLPC SECONDARY DISPLAY CONTROLLER (DCON)
-M:     Jens Frederich <jfrederich@gmail.com>
-M:     Daniel Drake <dsd@laptop.org>
-M:     Jon Nettleton <jon.nettleton@gmail.com>
-W:     http://wiki.laptop.org/go/DCON
-S:     Maintained
-F:     drivers/staging/olpc_dcon/
-
-STAGING - PARALLEL LCD/KEYPAD PANEL DRIVER
-M:     Willy Tarreau <willy@meta-x.org>
-S:     Odd Fixes
-F:     drivers/staging/panel/
-
 STAGING - REALTEK RTL8712U DRIVERS
 M:     Larry Finger <Larry.Finger@lwfinger.net>
 M:     Florian Schilhabel <florian.c.schilhabel@googlemail.com>.
@@ -11931,6 +11942,12 @@ M:     David Härdeman <david@hardeman.nu>
 S:     Maintained
 F:     drivers/media/rc/winbond-cir.c
 
+WINSYSTEMS WS16C48 GPIO DRIVER
+M:     William Breathitt Gray <vilhelm.gray@gmail.com>
+L:     linux-gpio@vger.kernel.org
+S:     Maintained
+F:     drivers/gpio/gpio-ws16c48.c
+
 WIMAX STACK
 M:     Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
 M:     linux-wimax@intel.com