Merge branch 'cpuidle-arm' into pm-cpuidle
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 27 Jul 2013 12:19:53 +0000 (14:19 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 27 Jul 2013 12:19:53 +0000 (14:19 +0200)
commit9aadfa8fd9f8d311ba3014bf76e4d8aeee515533
treea34c6fb208a5994438efa935466e4e0b1e730551
parent9ec7684c976bc528c2f37bbc0045fab28d16d172
parentbe100ee83a812804d1f467f45aba9809ba49b732
Merge branch 'cpuidle-arm' into pm-cpuidle

* cpuidle-arm:
  ARM: ux500: cpuidle: Move ux500 cpuidle driver to drivers/cpuidle
  ARM: ux500: cpuidle: Remove pointless include
  ARM: ux500: cpuidle: Instantiate the driver from platform device
  ARM: davinci: cpuidle: Fix target residency
  cpuidle: Add Kconfig.arm and move calxeda, kirkwood and zynq