Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspe...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 6 Aug 2011 20:26:37 +0000 (13:26 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 6 Aug 2011 20:26:37 +0000 (13:26 -0700)
commitce195d328485459b77672ef20485a8e4f21477b5
tree60dacf394d6f002e41ee6b89561a2eea4dbee0ef
parent2560540b78b48c8050f56e8ff5903c11a4f7a16e
parent02b26774afebb2d62695ba3230319d70d8c6cc2d
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 / Runtime: Allow _put_sync() from interrupts-disabled context
  PM / Domains: Fix pm_genpd_poweron()