summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ebsa110
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-03-19 13:39:58 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-03-19 13:39:58 +0100
commit14b6848bc0134b8838d374c423df3edda9b1490e (patch)
tree724dc912efe84f432d33a798502811c5f5295774 /arch/arm/mach-ebsa110
parentMerge branch 'for-russell' of git://git.kernel.org/pub/scm/linux/kernel/git/c... (diff)
parent[ARM] omap: clk_set_parent: deny changing parent if clock is enabled (diff)
downloadlinux-14b6848bc0134b8838d374c423df3edda9b1490e.tar.xz
linux-14b6848bc0134b8838d374c423df3edda9b1490e.zip
Merge branch 'omap-clks3' into devel
Conflicts: arch/arm/mach-omap2/clock.c
Diffstat (limited to 'arch/arm/mach-ebsa110')
0 files changed, 0 insertions, 0 deletions