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

Conflicts:
	include/asm-generic/vmlinux.lds.h

diff --cc arch/arm/mach-highbank/highbank.c
Simple merge

diff --cc drivers/clk/Makefile
index 653a409edc2dd39ddacc2025b5acfd2ef1c84f89,0ad642fbe7946a3e4c96ae8a6694d0d73b97b935..be9392edc548eaf9d4b87e4b6e847d56db2f3910
--- 1/drivers/clk/Makefile
--- 2/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@@ -20,10 -25,7 +25,9 @@@ endi
  obj-$(CONFIG_MACH_LOONGSON1)  += clk-ls1x.o
  obj-$(CONFIG_ARCH_U8500)      += ux500/
  obj-$(CONFIG_ARCH_VT8500)     += clk-vt8500.o
- obj-$(CONFIG_ARCH_SUNXI)      += clk-sunxi.o
  obj-$(CONFIG_ARCH_ZYNQ)               += clk-zynq.o
 +obj-$(CONFIG_X86)             += x86/
 +obj-$(CONFIG_ARCH_TEGRA)      += tegra/
  
  # Chip specific
  obj-$(CONFIG_COMMON_CLK_WM831X) += clk-wm831x.o

diff --cc drivers/clk/clk-highbank.c
Simple merge

diff --cc drivers/clk/mxs/clk-imx28.c
Simple merge

diff --cc drivers/clk/versatile/clk-vexpress.c
Simple merge

diff --cc drivers/clocksource/sunxi_timer.c
Simple merge

diff --cc include/asm-generic/vmlinux.lds.h
index fc62ac5c6d4fa5324712cc3578be327261a6872c,c1fe60ad1540a0f922458cda1a6609c51de2c42e..287ca288cdc7128842d28fd0c537dee5a2589900
--- 1/include/asm-generic/vmlinux.lds.h
--- 2/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@@ -149,25 -149,16 +149,34 @@@
  #define TRACE_SYSCALLS()
  #endif
  
 +#ifdef CONFIG_CLKSRC_OF
 +#define CLKSRC_OF_TABLES() . = ALIGN(8);                              \
 +                         VMLINUX_SYMBOL(__clksrc_of_table) = .;       \
 +                         *(__clksrc_of_table)                         \
 +                         *(__clksrc_of_table_end)
 +#else
 +#define CLKSRC_OF_TABLES()
 +#endif
 +
 +#ifdef CONFIG_IRQCHIP
 +#define IRQCHIP_OF_MATCH_TABLE()                                      \
 +      . = ALIGN(8);                                                   \
 +      VMLINUX_SYMBOL(__irqchip_begin) = .;                            \
 +      *(__irqchip_of_table)                                           \
 +      *(__irqchip_of_end)
 +#else
 +#define IRQCHIP_OF_MATCH_TABLE()
 +#endif
  
+ #ifdef CONFIG_COMMON_CLK
+ #define CLK_OF_TABLES() . = ALIGN(8);                         \
+                       VMLINUX_SYMBOL(__clk_of_table) = .;     \
+                       *(__clk_of_table)                       \
+                       *(__clk_of_table_end)
+ #else
+ #define CLK_OF_TABLES()
+ #endif
+ 
  #define KERNEL_DTB()                                                  \
        STRUCT_ALIGN();                                                 \
        VMLINUX_SYMBOL(__dtb_start) = .;                                \
@@@ -511,9 -502,8 +520,10 @@@
        DEV_DISCARD(init.rodata)                                        \
        CPU_DISCARD(init.rodata)                                        \
        MEM_DISCARD(init.rodata)                                        \
 -      KERNEL_DTB()
 +      CLKSRC_OF_TABLES()                                              \
+       CLK_OF_TABLES()                                                 \
 +      KERNEL_DTB()                                                    \
 +      IRQCHIP_OF_MATCH_TABLE()
  
  #define INIT_TEXT                                                     \
        *(.init.text)                                                   \