]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspe...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 27 Jan 2011 20:32:49 +0000 (06:32 +1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 27 Jan 2011 20:32:49 +0000 (06:32 +1000)
commitb17b849946e581ad58af74933d4fb63ad8812937
tree6319a8785faab60cd3f6f9e76b8b8ba733533763
parent785eb10b9f1cf1a1b9e3bb5175da04dc0ffba553
parentc3810c88788d505d4ffd786addd111b745e42161
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 / Runtime: Don't enable interrupts while running in_interrupt