Merge branch 'clk' of git://github.com/hzhuang1/linux into next/cleanup

* 'clk' of git://github.com/hzhuang1/linux:
  ARM: mmp: remove unused definition in APBC and APMU
  ARM: mmp: move mmp2 clock definition to separated file
  arm: mmp: move pxa910 clock definition to separated file
  arm: mmp: move pxa168 clock definition to separated file
  arm: mmp: make private clock definition exclude from common clock
  + Linux 3.6-rc4

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mach-dove/common.c
Simple merge

diff --cc arch/arm/mach-kirkwood/common.c
Simple merge

diff --cc arch/arm/mach-mv78xx0/addr-map.c
Simple merge

diff --cc arch/arm/mach-mv78xx0/common.c
Simple merge

diff --cc arch/arm/mach-orion5x/common.c
Simple merge

diff --cc arch/arm/plat-samsung/devs.c
index 8154fab70de8404a5ea89f71b8f6f20e0056c9ff,fc49f3dabd7653624b7f9ccc8e78ef12b102d527..6ff45d53362c1a0ef61d0806626829223f96e78e
--- 1/arch/arm/plat-samsung/devs.c
--- 2/arch/arm/plat-samsung/devs.c
+++ b/arch/arm/plat-samsung/devs.c
@@@ -32,7 -32,10 +32,9 @@@
  #include <linux/platform_data/s3c-hsudc.h>
  #include <linux/platform_data/s3c-hsotg.h>
  
+ #include <media/s5p_hdmi.h>
+ 
  #include <asm/irq.h>
 -#include <asm/pmu.h>
  #include <asm/mach/arch.h>
  #include <asm/mach/map.h>
  #include <asm/mach/irq.h>