From: Rafael J. Wysocki <rjw@sisk.pl>
Date: Wed, 15 Aug 2012 19:00:26 +0000 (+0200)
Subject: Merge branch 'pm-cpuidle-next' into linux-next
X-Git-Tag: next-20120816~34^2~5
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1b26cd77033fd531ab0fb1f48de652522d090d4c;p=karo-tx-linux.git

Merge branch 'pm-cpuidle-next' into linux-next

* pm-cpuidle-next:
  PM / cpuidle: Make ladder governor use the "disabled" state flag
  Honor state disabling in the cpuidle ladder governor
---

1b26cd77033fd531ab0fb1f48de652522d090d4c