Merge remote-tracking branch 'clk/clk-next'

Conflicts:
	drivers/clk/Makefile

diff --cc drivers/clk/Makefile
index d25da26ad11382110537763e8c017ade78f79f00,df33820b45ec6ad275c6d920a3c710e3298ccfd6..fe3121b341c028ef19c27e3f791558c948f219d6
--- 1/drivers/clk/Makefile
--- 2/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@@ -32,7 -32,8 +32,9 @@@ obj-$(CONFIG_ARCH_VT8500)     += clk-vt8500
  obj-$(CONFIG_ARCH_ZYNQ)               += zynq/
  obj-$(CONFIG_ARCH_TEGRA)      += tegra/
  obj-$(CONFIG_PLAT_SAMSUNG)    += samsung/
 +obj-$(CONFIG_ARCH_SHMOBILE_MULTI)     += shmobile/
+ obj-$(CONFIG_COMMON_CLK_XGENE)  += clk-xgene.o
+ obj-$(CONFIG_COMMON_CLK_KEYSTONE)     += keystone/
  
  obj-$(CONFIG_X86)             += x86/