From: Rafael J. Wysocki <rjw@sisk.pl>
Date: Mon, 3 Sep 2012 23:45:50 +0000 (+0200)
Subject: Merge branch 'pm-cpuidle' into pm-shmobile
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6bf9af464c4894e613567c0fb6559be67f31c88a;p=linux-beck.git

Merge branch 'pm-cpuidle' into pm-shmobile

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

6bf9af464c4894e613567c0fb6559be67f31c88a