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

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mach-realview/core.c
Simple merge

diff --cc arch/arm/mach-realview/realview_eb.c
Simple merge

diff --cc arch/arm/mach-realview/realview_pb1176.c
Simple merge

diff --cc arch/arm/mach-realview/realview_pb11mp.c
Simple merge

diff --cc arch/arm/mach-realview/realview_pba8.c
index 25fdc6b0135cdf067e527389f3bdb1d7ddff8f99,5032775dbfeefb51bb07bfce6d1e34fc9819127c..9992431b8a15121e6a5b56c5727d234f4ab6be5d
--- 1/arch/arm/mach-realview/realview_pba8.c
--- 2/arch/arm/mach-realview/realview_pba8.c
+++ b/arch/arm/mach-realview/realview_pba8.c
@@@ -27,9 -27,12 +27,10 @@@
  #include <linux/amba/mmci.h>
  #include <linux/amba/pl022.h>
  #include <linux/io.h>
+ #include <linux/platform_data/clk-realview.h>
  
  #include <asm/irq.h>
 -#include <asm/leds.h>
  #include <asm/mach-types.h>
 -#include <asm/pmu.h>
  #include <asm/pgtable.h>
  #include <asm/hardware/gic.h>
  

diff --cc arch/arm/mach-realview/realview_pbx.c
index 05f28d853c706d825cca0f77960767494d4109ba,de64ba0ddb956822a27e0b4b7c77f2d04e45e699..17954a327e1bb31340ec678844d89ffd4cef5370
--- 1/arch/arm/mach-realview/realview_pbx.c
--- 2/arch/arm/mach-realview/realview_pbx.c
+++ b/arch/arm/mach-realview/realview_pbx.c
@@@ -26,9 -26,12 +26,10 @@@
  #include <linux/amba/mmci.h>
  #include <linux/amba/pl022.h>
  #include <linux/io.h>
+ #include <linux/platform_data/clk-realview.h>
  
  #include <asm/irq.h>
 -#include <asm/leds.h>
  #include <asm/mach-types.h>
 -#include <asm/pmu.h>
  #include <asm/smp_twd.h>
  #include <asm/pgtable.h>
  #include <asm/hardware/gic.h>