Merge branch 'clk-omap-legacy' into clk-next

Conflicts:
	arch/arm/mach-omap2/cclock3xxx_data.c

diff --cc drivers/clk/ti/Makefile
index 36acc7d0d91cd841366e745841714bcbc09e5388,d8a770ae508def9b1540eb66d66f948c76802237..14e6686a5eeafcc2b818b06bed10f1558e320bd9
--- 1/drivers/clk/ti/Makefile
--- 2/drivers/clk/ti/Makefile
+++ b/drivers/clk/ti/Makefile
@@@ -3,9 -3,9 +3,10 @@@ obj-y                                   += clk.o autoidle.o clockdoma
  clk-common                            = dpll.o composite.o divider.o gate.o \
                                          fixed-factor.o mux.o apll.o
  obj-$(CONFIG_SOC_AM33XX)              += $(clk-common) clk-33xx.o
 +obj-$(CONFIG_SOC_TI81XX)              += $(clk-common) fapll.o clk-816x.o
  obj-$(CONFIG_ARCH_OMAP2)              += $(clk-common) interface.o clk-2xxx.o
- obj-$(CONFIG_ARCH_OMAP3)              += $(clk-common) interface.o clk-3xxx.o
+ obj-$(CONFIG_ARCH_OMAP3)              += $(clk-common) interface.o \
+                                          clk-3xxx.o clk-3xxx-legacy.o
  obj-$(CONFIG_ARCH_OMAP4)              += $(clk-common) clk-44xx.o
  obj-$(CONFIG_SOC_OMAP5)                       += $(clk-common) clk-54xx.o
  obj-$(CONFIG_SOC_DRA7XX)              += $(clk-common) clk-7xx.o \

diff --cc include/linux/clk/ti.h
Simple merge