Merge branches 'spear/clock' and 'imx/clock' into next/clock
authorArnd Bergmann <arnd@arndb.de>
Mon, 14 May 2012 15:43:35 +0000 (17:43 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 14 May 2012 15:43:59 +0000 (17:43 +0200)
Updated to resolve dependencies.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Trivial merge