From: Thierry Reding <treding@nvidia.com>
Date: Thu, 24 Oct 2013 13:02:40 +0000 (+0200)
Subject: Merge remote-tracking branch 'clk/clk-next'
X-Git-Tag: next-20131024~14
X-Git-Url: https://git.karo-electronics.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=e1200d8a358cd07d1a39ce3275cf86241e14de02

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

Conflicts:
	drivers/clk/Makefile
---

e1200d8a358cd07d1a39ce3275cf86241e14de02
diff --cc drivers/clk/Makefile
index d25da26ad113,df33820b45ec..fe3121b341c0
--- a/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/