Merge unstable branch 'omap-rmk'
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Fri, 3 Oct 2008 10:52:33 +0000 (11:52 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 3 Oct 2008 10:52:33 +0000 (11:52 +0100)
Merge branch 'omap-rmk' into omap-all

1  2 
arch/arm/mach-omap2/clock.c
arch/arm/mach-omap2/prm.h

Simple merge
Simple merge