tree 648c6a9ebd0ecfae1d5ef9c44e9996300b7232cd
parent 45314915ed8089634144c975357bf5ba17f06ab9
parent 00fafcda1773245a5292f953321ec3f0668c8c28
author Linus Torvalds <torvalds@linux-foundation.org> 1289949497 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1289949497 -0800

Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/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