Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspe...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 16 Nov 2010 23:18:17 +0000 (15:18 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 16 Nov 2010 23:18:17 +0000 (15:18 -0800)
* '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


Trivial merge