Merge branch 'cross-platform/clkdev' into next/cross-platform
Arnd Bergmann [Tue, 19 Jul 2011 16:10:44 +0000 (18:10 +0200)]

Trivial merge