From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 29 Jul 2013 13:40:32 +0000 (+0200)
Subject: Merge branch 'pm-cpuidle' into linux-next
X-Git-Tag: next-20130731~69^2~7
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e25587ae2e726ed8f50b5df5437e0d1a8e82dcba;p=karo-tx-linux.git

Merge branch 'pm-cpuidle' into linux-next

* pm-cpuidle:
  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
  cpuidle: Check if device is already registered
  cpuidle: Introduce __cpuidle_device_init()
  cpuidle: Introduce __cpuidle_unregister_device()
  cpuidle: Add missing forward declarations of structures
  cpuidle: Make cpuidle's sysfs directory dynamically allocated
  cpuidle: Fix white space to follow CodingStyle
  cpuidle: Check cpuidle_enable_device() return value
  cpuidle: Make it clear that governors cannot be modules
---

e25587ae2e726ed8f50b5df5437e0d1a8e82dcba