Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspe...
commit1e8703b2e6aefba84dd9633d90a4093ff1200b93
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 16 Nov 2010 23:18:17 +0000 (16 15:18 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 16 Nov 2010 23:18:17 +0000 (16 15:18 -0800)
tree648c6a9ebd0ecfae1d5ef9c44e9996300b7232cd
parent45314915ed8089634144c975357bf5ba17f06ab9
parent00fafcda1773245a5292f953321ec3f0668c8c28
Merge branch 'pm-fixes' of git://git./linux/kernel/git/rafael/suspend-2.6

* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
  PM / PM QoS: Fix reversed min and max
  PM / OPP: Hide OPP configuration when SoCs do not provide an implementation
  PM: Allow devices to be removed during late suspend and early resume