]> 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>
Mon, 11 Jul 2011 19:49:03 +0000 (12:49 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 11 Jul 2011 19:49:03 +0000 (12:49 -0700)
commit9ddf7f5058c4f4badd38dba8d5896a5dbd7e716f
tree14f3a30906900b54ab2fe17300b60e41863504d8
parent71a1b44b036457169e7974eea0b5b37f64176952
parent887596224cca4dc4669c53e4d7a33fcfc9d9e823
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: Reintroduce dropped call to check_wakeup_irqs