Merge branch 'clk-ti' into clk-next
authorMichael Turquette <mturquette@baylibre.com>
Wed, 2 Mar 2016 00:23:40 +0000 (16:23 -0800)
committerMichael Turquette <mturquette@baylibre.com>
Wed, 2 Mar 2016 00:23:40 +0000 (16:23 -0800)
commit3b0f4ae3e9f101ecfd918efd2a82fca0ae0b6c95
treeaa530b9801bd3acdb77cd10c15e6e344115acc84
parent811a498e5e9ab802cbd23a8ef9c844ec92450fa4
parent8a8b6eb7a87f12804f44128d6e4c59b19f224308
Merge branch 'clk-ti' into clk-next

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