Merge branches 'clk/mxs' and 'imx/pinctrl/for-3.5' into mxs/dt/for-3.5
authorShawn Guo <shawn.guo@linaro.org>
Sat, 12 May 2012 05:32:09 +0000 (13:32 +0800)
committerShawn Guo <shawn.guo@linaro.org>
Sat, 12 May 2012 05:32:09 +0000 (13:32 +0800)

Trivial merge