]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commite4b2b71bc18ce397e5d29780053a0a580860cb85
treed911226fa3a204d139cbc136e7d1bb1bba4711b3
parent784c21981fb06548c7864309b48ae8677f3922d1
parentb08d05ddc269e1151a42af4cbc5787e85a57c5b8
Merge branch 'clk-next-hi6220' into clk-next

Conflicts:
drivers/clk/Kconfig
drivers/clk/Kconfig
drivers/clk/Makefile