From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Sat, 27 Jul 2013 12:19:53 +0000 (+0200)
Subject: Merge branch 'cpuidle-arm' into pm-cpuidle
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=9aadfa8fd9f8d311ba3014bf76e4d8aeee515533;p=deliverable%2Flinux.git

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
---

9aadfa8fd9f8d311ba3014bf76e4d8aeee515533