From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 3 Jun 2014 21:10:15 +0000 (+0200)
Subject: Merge branch 'pm-cpuidle'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=97b80e685ffae9a6dc946ab08ed32f1eafda97d7;p=linux.git

Merge branch 'pm-cpuidle'

* pm-cpuidle:
  PM / suspend: Always use deepest C-state in the "freeze" sleep state
  cpuidle / menu: move repeated correction factor check to init
  cpuidle / menu: Return (-1) if there are no suitable states
  cpuidle: Combine cpuidle_enabled() with cpuidle_select()
  ARM: clps711x: Add cpuidle driver
---

97b80e685ffae9a6dc946ab08ed32f1eafda97d7