Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index fed7f9743f14d212bfeb2c75080013a743e3cda5..7ea0c11b8e8d5e203fb1d10ff4bfe9882e131ef3 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1466,6 +1466,7 @@ F:        arch/arm64/boot/dts/amlogic/
 F:     drivers/pinctrl/meson/
 F:     drivers/mmc/host/meson*
 F:     drivers/soc/amlogic/
+F:     drivers/rtc/rtc-meson*
 N:     meson
 
 ARM/Amlogic Meson SoC Sound Drivers
@@ -4337,6 +4338,12 @@ S:       Maintained
 F:     Documentation/filesystems/cramfs.txt
 F:     fs/cramfs/
 
+CREATIVE SB0540
+M:     Bastien Nocera <hadess@hadess.net>
+L:     linux-input@vger.kernel.org
+S:     Maintained
+F:     drivers/hid/hid-creative-sb0540.c
+
 CRYPTO API
 M:     Herbert Xu <herbert@gondor.apana.org.au>
 M:     "David S. Miller" <davem@davemloft.net>
@@ -5802,6 +5809,12 @@ L:       linux-edac@vger.kernel.org
 S:     Maintained
 F:     drivers/edac/amd64_edac*
 
+EDAC-ARMADA
+M:     Jan Luebbe <jlu@pengutronix.de>
+L:     linux-edac@vger.kernel.org
+S:     Maintained
+F:     drivers/edac/armada_xp_*
+
 EDAC-AST2500
 M:     Stefan Schaeckeler <sschaeck@cisco.com>
 S:     Supported
@@ -11504,7 +11517,6 @@ NOKIA N900 POWER SUPPLY DRIVERS
 R:     Pali Rohár <pali.rohar@gmail.com>
 F:     include/linux/power/bq2415x_charger.h
 F:     include/linux/power/bq27xxx_battery.h
-F:     include/linux/power/isp1704_charger.h
 F:     drivers/power/supply/bq2415x_charger.c
 F:     drivers/power/supply/bq27xxx_battery.c
 F:     drivers/power/supply/bq27xxx_battery_i2c.c
@@ -11517,6 +11529,11 @@ S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/wtarreau/nolibc.git
 F:     tools/include/nolibc/
 
+NSDEPS
+M:     Matthias Maennich <maennich@google.com>
+S:     Maintained
+F:     scripts/nsdeps
+
 NTB AMD DRIVER
 M:     Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
 L:     linux-ntb@googlegroups.com
@@ -11867,6 +11884,7 @@ S:      Maintained
 F:     arch/arm/mach-omap2/
 F:     arch/arm/plat-omap/
 F:     arch/arm/configs/omap2plus_defconfig
+F:     drivers/bus/ti-sysc.c
 F:     drivers/i2c/busses/i2c-omap.c
 F:     drivers/irqchip/irq-omap-intc.c
 F:     drivers/mfd/*omap*.c
@@ -11887,6 +11905,7 @@ F:      drivers/regulator/tps65910-regulator.c
 F:     drivers/regulator/twl-regulator.c
 F:     drivers/regulator/twl6030-regulator.c
 F:     include/linux/platform_data/i2c-omap.h
+F:     include/linux/platform_data/ti-sysc.h
 
 ONION OMEGA2+ BOARD
 M:     Harvey Hunt <harveyhuntnexus@gmail.com>
@@ -13735,7 +13754,7 @@ REMOTE PROCESSOR (REMOTEPROC) SUBSYSTEM
 M:     Ohad Ben-Cohen <ohad@wizery.com>
 M:     Bjorn Andersson <bjorn.andersson@linaro.org>
 L:     linux-remoteproc@vger.kernel.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc.git rproc-next
 S:     Maintained
 F:     Documentation/devicetree/bindings/remoteproc/
 F:     Documentation/ABI/testing/sysfs-class-remoteproc
@@ -13748,7 +13767,7 @@ REMOTE PROCESSOR MESSAGING (RPMSG) SUBSYSTEM
 M:     Ohad Ben-Cohen <ohad@wizery.com>
 M:     Bjorn Andersson <bjorn.andersson@linaro.org>
 L:     linux-remoteproc@vger.kernel.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/rpmsg.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc.git rpmsg-next
 S:     Maintained
 F:     drivers/rpmsg/
 F:     Documentation/rpmsg.txt