commit | 9ddf7f5058c4f4badd38dba8d5896a5dbd7e716f | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jul 11 12:49:03 2011 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jul 11 12:49:03 2011 -0700 |
tree | 14f3a30906900b54ab2fe17300b60e41863504d8 | |
parent | 71a1b44b036457169e7974eea0b5b37f64176952 [diff] | |
parent | 887596224cca4dc4669c53e4d7a33fcfc9d9e823 [diff] |
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