Merge branch 'clk' of git://github.com/hzhuang1/linux into next/cleanup
authorOlof Johansson <olof@lixom.net>
Thu, 13 Sep 2012 05:34:11 +0000 (22:34 -0700)
committerOlof Johansson <olof@lixom.net>
Thu, 13 Sep 2012 05:34:11 +0000 (22:34 -0700)
commit025c95a6826ad8acfe871f33c2fa9208beeb38df
tree220fe156ff60db13bd3a1319f5e20d6b723de5f4
parent0558d7a8ed44e6e53aadb04d2e23145efb2aa8a4
parent7f744b17140af1a9c8804a1c81c9dae6bb52a7fb
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
arch/arm/Kconfig
arch/arm/mach-dove/common.c
arch/arm/mach-kirkwood/common.c
arch/arm/mach-mv78xx0/addr-map.c
arch/arm/mach-mv78xx0/common.c
arch/arm/mach-orion5x/common.c
arch/arm/plat-samsung/devs.c