diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-26 17:22:53 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-26 17:22:53 -0800 |
| commit | 06a79b82b2a3e4bebb9a20638ca208c780e9e507 (patch) | |
| tree | 594a11b60ba56d7ae62f8affa4cd61836e70e4b1 /arch/m68k | |
| parent | 4912002fffa377e66c5caefc2c311732a4ad5fb8 (diff) | |
| parent | a9c9b4429df437982d2fbfab1f4b46b01329e9ed (diff) | |
| download | kernel_samsung_aries-06a79b82b2a3e4bebb9a20638ca208c780e9e507.zip kernel_samsung_aries-06a79b82b2a3e4bebb9a20638ca208c780e9e507.tar.gz kernel_samsung_aries-06a79b82b2a3e4bebb9a20638ca208c780e9e507.tar.bz2 | |
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 / Hibernate: Fix preallocating of memory
PM / Hibernate: Remove swsusp.c finally
PM / Hibernate: Remove trailing space in message
PM: Allow SCSI devices to suspend/resume asynchronously
PM: Allow USB devices to suspend/resume asynchronously
USB: implement non-tree resume ordering constraints for PCI host controllers
PM: Allow PCI devices to suspend/resume asynchronously
PM / Hibernate: Swap, remove useless check from swsusp_read()
PM / Hibernate: Really deprecate deprecated user ioctls
PM: Allow device drivers to use dpm_wait()
PM: Start asynchronous resume threads upfront
PM: Add facility for advanced testing of async suspend/resume
PM: Add a switch for disabling/enabling asynchronous suspend/resume
PM: Asynchronous suspend and resume of devices
PM: Add parent information to timing messages
PM: Document device power attributes in sysfs
PM / Runtime: Add sysfs switch for disabling device run-time PM
Diffstat (limited to 'arch/m68k')
0 files changed, 0 insertions, 0 deletions