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)
commit56f68556d7bbb51dd158c74deb09c783345bfbbd
tree536e6e3c7063b1eee927194dda257602bd3dc66f
parentfd9470ce3ac6fb54d6026e4b1cdab0936e34805e
parent7c8ad9828e793573877fd60868bb5d2f1e3b64da
Merge unstable branch 'omap-rmk'

Merge branch 'omap-rmk' into omap-all
arch/arm/mach-omap2/clock.c
arch/arm/mach-omap2/prm.h