tree 14f3a30906900b54ab2fe17300b60e41863504d8
parent 71a1b44b036457169e7974eea0b5b37f64176952
parent 887596224cca4dc4669c53e4d7a33fcfc9d9e823
author Linus Torvalds <torvalds@linux-foundation.org> 1310413743 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1310413743 -0700

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