Merge branch 'clk/mxs' of git://git.linaro.org/people/shawnguo/linux-2.6 into next...

[deliverable/linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 707163365a9308845de03708d43fcbdde8c5452c..1baf9be3f8ddb5ab8d0267fa63199f1c8ce422bf 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