Merge branch 'spear/pinctrl' into spear/clock

[karo-tx-linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index cf900fcd074b1482798b98b3351fa8d5c1e172d8..27085a75162f3ae6cb49a77397026a5e3134b946 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1882,6 +1882,16 @@ F:       Documentation/filesystems/coda.txt
 F:     fs/coda/
 F:     include/linux/coda*.h
 
+COMMON CLK FRAMEWORK
+M:     Mike Turquette <mturquette@ti.com>
+M:     Mike Turquette <mturquette@linaro.org>
+L:     linux-arm-kernel@lists.infradead.org (same as CLK API & CLKDEV)
+T:     git git://git.linaro.org/people/mturquette/linux.git
+S:     Maintained
+F:     drivers/clk/clk.c
+F:     drivers/clk/clk-*
+F:     include/linux/clk-pr*
+
 COMMON INTERNET FILE SYSTEM (CIFS)
 M:     Steve French <sfrench@samba.org>
 L:     linux-cifs@vger.kernel.org
@@ -2321,9 +2331,9 @@ S:        Supported
 F:     drivers/acpi/dock.c
 
 DOCUMENTATION
-M:     Randy Dunlap <rdunlap@xenotime.net>
+M:     Rob Landley <rob@landley.net>
 L:     linux-doc@vger.kernel.org
-T:     quilt http://xenotime.net/kernel-doc-patches/current/
+T:     TBD
 S:     Maintained
 F:     Documentation/
 
@@ -6334,9 +6344,7 @@ L:        spear-devel@list.st.com
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 W:     http://www.st.com/spear
 S:     Maintained
-F:     arch/arm/mach-spear*/clock.c
-F:     arch/arm/plat-spear/clock.c
-F:     arch/arm/plat-spear/include/plat/clock.h
+F:     drivers/clk/spear/
 
 SPI SUBSYSTEM
 M:     Grant Likely <grant.likely@secretlab.ca>