Merge branch 'mxs/clk-prepare' of git://git.linaro.org/people/shawnguo/linux-2.6...
Arnd Bergmann [Tue, 3 Jan 2012 20:34:14 +0000 (20:34 +0000)]

Trivial merge