Merge branch 'imx/clk' into imx/dt
authorShawn Guo <shawnguo@kernel.org>
Tue, 22 Dec 2015 12:40:27 +0000 (20:40 +0800)
committerShawn Guo <shawnguo@kernel.org>
Tue, 22 Dec 2015 12:40:27 +0000 (20:40 +0800)

Trivial merge