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
This commit is contained in:
Rafael J. Wysocki 2012-09-04 01:45:50 +02:00
commit 6bf9af464c
2 changed files with 14 additions and 2 deletions