Subject: linux-next: manual merge of the clk tree

From: Thierry Reding <[email-masked]>
Date: Wed, 9 Oct 2013 16:14:24 +0200

Today's linux-next merge of the clk tree got a conflict in

	drivers/clk/Makefile

caused by commits f00578d (clk: emev2: Add support for emev2 SMU clocks
with DT), 6cfc229 (clk: keystone: Build Keystone clock drivers) and
308964c (clk: Add APM X-Gene SoC clock driver).

I fixed it up (see below). Please verify that the resolution looks good.

Thanks,
Thierry
---
diff --cc drivers/clk/Makefile
index d25da26,df33820..fe3121b
--- 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/