Merge branch 'omap-clks3' into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Thu, 19 Mar 2009 12:39:58 +0000 (12:39 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 19 Mar 2009 12:39:58 +0000 (12:39 +0000)
commit14b6848bc0134b8838d374c423df3edda9b1490e
tree724dc912efe84f432d33a798502811c5f5295774
parent05d9881bc4c6f172997b7a59e4a1a95910c4ebd7
parent4da3782151300237db3abe070f716922889252e0
Merge branch 'omap-clks3' into devel

Conflicts:

arch/arm/mach-omap2/clock.c
arch/arm/mach-omap2/board-ldp.c
arch/arm/mach-omap2/clock.c
drivers/mmc/host/omap_hsmmc.c