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 00ace1a989f9fe8454f98a442d89f29255b34429..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>
@@ -11510,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
@@ -11523,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
@@ -13743,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
@@ -13756,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