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)
commitae8d4048fada71a77144e0f05e8612f90b9501f0
treed911226fa3a204d139cbc136e7d1bb1bba4711b3
parent19fbbbbcd3a3a8e307a4768784166abf7b55b779
parent72ea48610d43c59507d9ad39083d40085400ba12
Merge branch 'clk-next-hi6220' into clk-next

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