aboutsummaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-05-13 00:11:06 +0200
committerArnd Bergmann <arnd@arndb.de>2012-05-13 00:11:06 +0200
commiteae0185a9677d3ff0c1781ee196f2ef42deb0ea1 (patch)
tree15ed6ba564cd04b4ac7235f85ea7489d4eeaaa9b /MAINTAINERS
parent93c6d8927fa692faef3d7d945bd4fe84b0185ad4 (diff)
parent5df33a62c4a028d6fc7f2dcc159827d09b7334b8 (diff)
Merge branch 'spear/clock' into next/clock
Viresh Kumar <viresh.kumar@st.com> writes: This is rebased over a (merge of Mike's/clk-next & SPEAr's DT) + Russell's patch: CLKDEV: provide helpers for common clock framework rebased over them. * spear/clock: SPEAr: Switch to common clock framework SPEAr: Call clk_prepare() before calling clk_enable SPEAr: clk: Add General Purpose Timer Synthesizer clock SPEAr: clk: Add Fractional Synthesizer clock SPEAr: clk: Add Auxiliary Synthesizer clock SPEAr: clk: Add VCO-PLL Synthesizer clock Conflicts: drivers/clk/Makefile [Arnd: rebased again without the spear/dt branch] Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS4
1 files changed, 1 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 1baf9be3f8d..b7adeed338d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6334,9 +6334,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/
SPEAR PAD MULTIPLEXING SUPPORT
M: Viresh Kumar <viresh.kumar@st.com>