From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 7 Nov 2013 18:25:12 +0000 (+0100)
Subject: Merge branch 'pm-cpuidle'
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=adf9684588ec1769b77a9e1c7c68fbad49ec5e43;p=linux-beck.git

Merge branch 'pm-cpuidle'

* pm-cpuidle:
  ARM: EXYNOS: Remove incorrect __init annotation from cpuidle driver
  ARM: EXYNOS: Use dev_err() instead of printk() for cpuidle driver
  intel_idle: use CPU_TASKS_FROZEN instead of a numeric constant
  cpuidle: remove cpuidle_unregister_governor()
  cpuidle: don't call poll_idle_init() for every cpu
  cpuidle: use drv instead of cpuidle_driver in show_current_driver()
  cpuidle: call cpuidle_get_driver() from after taking cpuidle_driver_lock
  cpuidle: replace multiline statements with single line in cpuidle_idle_call()
  cpuidle: reduce code duplication inside cpuidle_idle_call()
  cpuidle: merge two if() statements for checking error cases
  cpuidle: rearrange __cpuidle_register_device() to keep minimal exit points
  cpuidle: rearrange code in __cpuidle_driver_init()
  cpuidle: make __cpuidle_driver_init() return void
  cpuidle: make __cpuidle_device_init() return void
  cpuidle: Fix comments in cpuidle core
  cpuidle: fix indentation of cpumask
---

adf9684588ec1769b77a9e1c7c68fbad49ec5e43