]> git.openpandora.org Git - pandora-kernel.git/commitdiff
Merge branch 'clk-next-hi6220' into clk-next
authorMichael Turquette <mturquette@linaro.org>
Wed, 3 Jun 2015 22:22:03 +0000 (15:22 -0700)
committerMichael Turquette <mturquette@linaro.org>
Wed, 3 Jun 2015 22:22:03 +0000 (15:22 -0700)
Conflicts:
drivers/clk/Kconfig


Trivial merge