diff --git a/[refs] b/[refs] index fbc6134999be..11da19605150 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0e1c03017549a9df513622b3f15ff38eb8d35a62 +refs/heads/master: 7704addb60e274d4e98c69a02f7ebe3f77c6c3a4 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 1a2f8f5823e0..164e9a1df0f6 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -1882,6 +1882,16 @@ F: Documentation/filesystems/coda.txt F: fs/coda/ F: include/linux/coda*.h +COMMON CLK FRAMEWORK +M: Mike Turquette +M: Mike Turquette +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 L: linux-cifs@vger.kernel.org