diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-08 17:07:16 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-08 17:07:16 +0100 |
commit | dad3de7d0090280f44ff27131ed2878f1ab6ddad (patch) | |
tree | f887c721761ce845037d96b59542198294a5d3a5 /arch/arm/mach-at91/board-kb9202.c | |
parent | Merge branch 'kvm-updates/2.6.33' of git://git.kernel.org/pub/scm/virt/kvm/kvm (diff) | |
parent | PM: Add flag for devices capable of generating run-time wake-up events (diff) | |
download | linux-dad3de7d0090280f44ff27131ed2878f1ab6ddad.tar.xz linux-dad3de7d0090280f44ff27131ed2878f1ab6ddad.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
PM: Add flag for devices capable of generating run-time wake-up events
PM / Runtime: Remove unnecessary braces in __pm_runtime_set_status()
PM / Runtime: Make documentation of runtime_idle() agree with the code
PM / Runtime: Ensure timer_expires is nonzero in pm_schedule_suspend()
PM / Runtime: Use deferred_resume flag in pm_request_resume
PM / Runtime: Export the PM runtime workqueue
PM / Runtime: Fix lockdep warning in __pm_runtime_set_status()
PM / Hibernate: Swap, use KERN_CONT
PM / Hibernate: Shift remaining code from swsusp.c to hibernate.c
PM / Hibernate: Move swap functions to kernel/power/swap.c.
PM / freezer: Don't get over-anxious while waiting
Diffstat (limited to 'arch/arm/mach-at91/board-kb9202.c')
0 files changed, 0 insertions, 0 deletions