Merge branch 'clk-ti' into clk-next

Conflicts:
	drivers/clk/Kconfig

diff --cc drivers/clk/Kconfig
index 15f548a,5bf16cc..16f7d33
--- 1/drivers/clk/Kconfig
--- 2/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@@ -199,9 -202,12 +199,10 @@@ config COMMON_CLK_PX
  
  source "drivers/clk/bcm/Kconfig"
  source "drivers/clk/hisilicon/Kconfig"
 +source "drivers/clk/mvebu/Kconfig"
  source "drivers/clk/qcom/Kconfig"
 +source "drivers/clk/samsung/Kconfig"
 +source "drivers/clk/tegra/Kconfig"
+ source "drivers/clk/ti/Kconfig"
  
  endmenu
 -
 -source "drivers/clk/mvebu/Kconfig"
 -
 -source "drivers/clk/samsung/Kconfig"
 -source "drivers/clk/tegra/Kconfig"

diff --cc drivers/clk/Makefile
Simple merge