Merge tag 'scpi-updates-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep...

[mirror_ubuntu-bionic-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 9e984645c4b08b9e20ebc839704a5d25b0c32032..378133ba441a7a4346340106c3418c9bd095ff35 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7143,7 +7143,7 @@ S:        Maintained
 F:     drivers/media/platform/rcar_jpu.c
 
 JSM Neo PCI based serial card
-M:     Gabriel Krisman Bertazi <krisman@linux.vnet.ibm.com>
+M:     Guilherme G. Piccoli <gpiccoli@linux.vnet.ibm.com>
 L:     linux-serial@vger.kernel.org
 S:     Maintained
 F:     drivers/tty/serial/jsm/
@@ -12633,6 +12633,8 @@ 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
+F:     Documentation/devicetree/bindings/reset/ti,sci-reset.txt
+F:     drivers/reset/reset-ti-sci.c
 
 THANKO'S RAREMONO AM/FM/SW RADIO RECEIVER USB DRIVER
 M:     Hans Verkuil <hverkuil@xs4all.nl>