Merge tag 'samsung-drivers-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 0f37c5a5e1c9ec171984f66db8b5fda516d677d3..946db7c66961305bd9bdc32129a6a587a8c6a7e2 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1268,6 +1268,7 @@ F:        arch/arm/mach-mxs/
 F:     arch/arm/boot/dts/imx*
 F:     arch/arm/configs/imx*_defconfig
 F:     drivers/clk/imx/
+F:     drivers/soc/imx/
 F:     include/soc/imx/
 
 ARM/FREESCALE VYBRID ARM ARCHITECTURE
@@ -8309,7 +8310,6 @@ M:        Richard Leitner <richard.leitner@skidata.com>
 L:     linux-usb@vger.kernel.org
 S:     Maintained
 F:     drivers/usb/misc/usb251xb.c
-F:     include/linux/platform_data/usb251xb.h
 F:     Documentation/devicetree/bindings/usb/usb251xb.txt
 
 MICROSOFT SURFACE PRO 3 BUTTON DRIVER
@@ -12385,6 +12385,9 @@ S:      Maintained
 F:     Documentation/devicetree/bindings/arm/keystone/ti,sci.txt
 F:     drivers/firmware/ti_sci*
 F:     include/linux/soc/ti/ti_sci_protocol.h
+F:     Documentation/devicetree/bindings/soc/ti/sci-pm-domain.txt
+F:     include/dt-bindings/genpd/k2g.h
+F:     drivers/soc/ti/ti_sci_pm_domains.c
 
 THANKO'S RAREMONO AM/FM/SW RADIO RECEIVER USB DRIVER
 M:     Hans Verkuil <hverkuil@xs4all.nl>