Merge tag 'for-linus-20150623' of git://git.infradead.org/linux-mtd

[linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index d8afd29536786b0907c795afeb8cd5aa3ff2d3b6..e46cf6f0e5b0c704e84103fb47c2f3eb1a9971c5 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -445,6 +445,7 @@ F:  drivers/input/misc/adxl34x.c
 
 ADVANSYS SCSI DRIVER
 M:     Matthew Wilcox <[email protected]>
+M:     Hannes Reinecke <[email protected]>
 L:     [email protected]
 S:     Maintained
 F:     Documentation/scsi/advansys.txt
@@ -1488,10 +1489,12 @@ F:      drivers/phy/phy-stih407-usb.c
 F:     drivers/phy/phy-stih41x-usb.c
 F:     drivers/pinctrl/pinctrl-st.c
 F:     drivers/reset/sti/
+F:     drivers/rtc/rtc-st-lpc.c
 F:     drivers/tty/serial/st-asc.c
 F:     drivers/usb/dwc3/dwc3-st.c
 F:     drivers/usb/host/ehci-st.c
 F:     drivers/usb/host/ohci-st.c
+F:     drivers/watchdog/st_lpc_wdt.c
 F:     drivers/ata/ahci_st.c
 
 ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
@@ -2250,6 +2253,13 @@ N:       bcm9583*
 N:     bcm583*
 N:     bcm113*
 
+BROADCOM BRCMSTB GPIO DRIVER
+M:     Gregory Fong <[email protected]>
+L:     [email protected]>
+S:     Supported
+F:     drivers/gpio/gpio-brcmstb.c
+F:     Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.txt
+
 BROADCOM KONA GPIO DRIVER
 M:     Ray Jui <[email protected]>
 L:     [email protected]
@@ -2257,6 +2267,12 @@ S:       Supported
 F:     drivers/gpio/gpio-bcm-kona.c
 F:     Documentation/devicetree/bindings/gpio/gpio-bcm-kona.txt
 
+BROADCOM STB NAND FLASH DRIVER
+M:     Brian Norris <[email protected]>
+L:     [email protected]
+S:     Maintained
+F:     drivers/mtd/nand/brcmnand/
+
 BROADCOM SPECIFIC AMBA DRIVER (BCMA)
 M:     Rafał Miłecki <[email protected]>
 L:     [email protected]
@@ -2603,6 +2619,13 @@ L:       [email protected]
 S:     Supported
 F:     drivers/scsi/fnic/
 
+CISCO SCSI HBA DRIVER
+M:     Narsimhulu Musini <[email protected]>
+M:     Sesidhar Baddela <[email protected]>
+L:     [email protected]
+S:     Supported
+F:     drivers/scsi/snic/
+
 CMPC ACPI DRIVER
 M:     Thadeu Lima de Souza Cascardo <[email protected]>
 M:     Daniel Oliveira Nascimento <[email protected]>
@@ -4643,6 +4666,18 @@ F:       drivers/hid/
 F:     include/linux/hid*
 F:     include/uapi/linux/hid*
 
+HID SENSOR HUB DRIVERS
+M:     Jiri Kosina <[email protected]>
+M:     Jonathan Cameron <[email protected]>
+M:     Srinivas Pandruvada <[email protected]>
+L:     [email protected]
+L:     [email protected]
+S:     Maintained
+F:     Documentation/hid/hid-sensor*
+F:     drivers/hid/hid-sensor-*
+F:     drivers/iio/*/hid-*
+F:     include/linux/hid-sensor-*
+
 HIGH-RESOLUTION TIMERS, CLOCKEVENTS, DYNTICKS
 M:     Thomas Gleixner <[email protected]>
 L:     [email protected]
@@ -4879,13 +4914,23 @@ M:      Marcelo Henrique Cerri <[email protected]>
 M:     Fionnuala Gunter <[email protected]>
 L:     [email protected]
 S:     Supported
-F:     drivers/crypto/nx/
+F:     drivers/crypto/nx/Makefile
+F:     drivers/crypto/nx/Kconfig
+F:     drivers/crypto/nx/nx-aes*
+F:     drivers/crypto/nx/nx-sha*
+F:     drivers/crypto/nx/nx.*
+F:     drivers/crypto/nx/nx_csbcpb.h
+F:     drivers/crypto/nx/nx_debugfs.h
 
 IBM Power 842 compression accelerator
 M:     Dan Streetman <[email protected]>
 S:     Supported
-F:     drivers/crypto/nx/nx-842.c
-F:     include/linux/nx842.h
+F:     drivers/crypto/nx/Makefile
+F:     drivers/crypto/nx/Kconfig
+F:     drivers/crypto/nx/nx-842*
+F:     include/linux/sw842.h
+F:     crypto/842.c
+F:     lib/842/
 
 IBM Power Linux RAID adapter
 M:     Brian King <[email protected]>
@@ -7594,6 +7639,14 @@ L:       [email protected]
 S:     Maintained
 F:     drivers/pci/host/*spear*
 
+PCI MSI DRIVER FOR APPLIEDMICRO XGENE
+M:     Duc Dang <[email protected]>
+L:     [email protected]
+L:     [email protected]
+S:     Maintained
+F:     Documentation/devicetree/bindings/pci/xgene-pci-msi.txt
+F:     drivers/pci/host/pci-xgene-msi.c
+
 PCMCIA SUBSYSTEM
 P:     Linux PCMCIA Team
 L:     [email protected]
@@ -7634,7 +7687,6 @@ F:        kernel/delayacct.c
 
 PERFORMANCE EVENTS SUBSYSTEM
 M:     Peter Zijlstra <[email protected]>
-M:     Paul Mackerras <[email protected]>
 M:     Ingo Molnar <[email protected]>
 M:     Arnaldo Carvalho de Melo <[email protected]>
 L:     [email protected]
@@ -8537,14 +8589,20 @@ L:      [email protected]
 S:     Maintained
 F:     drivers/video/fbdev/s3c-fb.c
 
-SAMSUNG MULTIFUNCTION DEVICE DRIVERS
+SAMSUNG MULTIFUNCTION PMIC DEVICE DRIVERS
 M:     Sangbeom Kim <[email protected]>
+M:     Krzysztof Kozlowski <[email protected]>
 L:     [email protected]
+L:     [email protected]
 S:     Supported
 F:     drivers/mfd/sec*.c
 F:     drivers/regulator/s2m*.c
 F:     drivers/regulator/s5m*.c
+F:     drivers/clk/clk-s2mps11.c
+F:     drivers/rtc/rtc-s5m.c
 F:     include/linux/mfd/samsung/
+F:     Documentation/devicetree/bindings/regulator/s5m8767-regulator.txt
+F:     Documentation/devicetree/bindings/mfd/s2mp*.txt
 
 SAMSUNG S5P/EXYNOS4 SOC SERIES CAMERA SUBSYSTEM DRIVERS
 M:     Kyungmin Park <[email protected]>
@@ -9583,6 +9641,13 @@ F:       arch/arc/
 F:     Documentation/devicetree/bindings/arc/
 F:     drivers/tty/serial/arc_uart.c
 
+SYSTEM CONFIGURATION (SYSCON)
+M:     Lee Jones <[email protected]>
+M:     Arnd Bergmann <[email protected]>
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git
+S:     Supported
+F:     drivers/mfd/syscon.c
+
 SYSV FILESYSTEM
 M:     Christoph Hellwig <[email protected]>
 S:     Maintained
@@ -10017,7 +10082,7 @@ F:      include/linux/toshiba.h
 F:     include/uapi/linux/toshiba.h
 
 TMIO MMC DRIVER
-M:     Ian Molton <ian.molton@codethink.co.uk>
+M:     Ian Molton <ian@mnementh.co.uk>
 L:     [email protected]
 S:     Maintained
 F:     drivers/mmc/host/tmio_mmc*
@@ -10895,7 +10960,7 @@ M:      Andy Lutomirski <[email protected]>
 L:     [email protected]
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/vdso
 S:     Maintained
-F:     arch/x86/vdso/
+F:     arch/x86/entry/vdso/
 
 XC2028/3028 TUNER DRIVER
 M:     Mauro Carvalho Chehab <[email protected]>