Merge branch 'clk/mxs-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6...
authorMike Turquette <mturquette@linaro.org>
Thu, 12 Jul 2012 00:57:49 +0000 (17:57 -0700)
committerMike Turquette <mturquette@linaro.org>
Thu, 12 Jul 2012 00:57:49 +0000 (17:57 -0700)
commitcb479129efa4c7d444c5b3f1d271bfdeadd271c8
treed6faedb002e31efd40a0c03b16197ada4ecf3b2a
parent50667d63085af108f625c83102430c1d74931d78
parent64e2bc41304726a5ca8a4d37754db69b88841ebf
Merge branch 'clk/mxs-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into clk-3.6
drivers/clk/mxs/clk-imx23.c
drivers/clk/mxs/clk-imx28.c