Merge tag 'v4.13-rockchip-clk1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[mirror_ubuntu-artful-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 6b36037cbe8f5b921bd990dc9450ec13b35fe93f..1ba72e6d8254d02b31135cb6e7eed90a242de20e 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2483,7 +2483,7 @@ S:        Maintained
 F:     drivers/net/ethernet/ec_bhf.c
 
 BFS FILE SYSTEM
-M:     "Tigran A. Aivazian" <tigran@aivazian.fsnet.co.uk>
+M:     "Tigran A. Aivazian" <aivazian.tigran@gmail.com>
 S:     Maintained
 F:     Documentation/filesystems/bfs.txt
 F:     fs/bfs/
@@ -12630,6 +12630,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/clock/ti,sci-clk.txt
+F:     drivers/clk/keystone/sci-clk.c
 
 THANKO'S RAREMONO AM/FM/SW RADIO RECEIVER USB DRIVER
 M:     Hans Verkuil <hverkuil@xs4all.nl>