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: (26 commits) PM / Wakeup: Show wakeup sources statistics in debugfs PM: Introduce library for device-specific OPPs (v7) PM: Add sysfs attr for rechecking dev hash from PM trace PM: Lock PM device list mutex in show_dev_hash() PM / Runtime: Remove idle notification after failing suspend PM / Hibernate: Modify signature used to mark swap PM / Runtime: Reduce code duplication in core helper functions PM: Allow wakeup events to abort freezing of tasks PM: runtime: add missed pm_request_autosuspend PM / Hibernate: Make some boot messages look less scary PM / Runtime: Implement autosuspend support PM / Runtime: Add no_callbacks flag PM / Runtime: Combine runtime PM entry points PM / Runtime: Merge synchronous and async runtime routines PM / Runtime: Replace boolean arguments with bitflags PM / Runtime: Move code in drivers/base/power/runtime.c sysfs: Add sysfs_merge_group() and sysfs_unmerge_group() PM: Fix potential issue with failing asynchronous suspend PM / Wakeup: Introduce wakeup source objects and event statistics (v3) PM: Fix signed/unsigned warning in dpm_show_time() ...
No related branches found
No related tags found
Showing
- Documentation/ABI/testing/sysfs-devices-power 88 additions, 0 deletionsDocumentation/ABI/testing/sysfs-devices-power
- Documentation/ABI/testing/sysfs-power 29 additions, 0 deletionsDocumentation/ABI/testing/sysfs-power
- Documentation/kernel-parameters.txt 5 additions, 0 deletionsDocumentation/kernel-parameters.txt
- Documentation/power/00-INDEX 2 additions, 0 deletionsDocumentation/power/00-INDEX
- Documentation/power/interface.txt 1 addition, 1 deletionDocumentation/power/interface.txt
- Documentation/power/opp.txt 375 additions, 0 deletionsDocumentation/power/opp.txt
- Documentation/power/runtime_pm.txt 220 additions, 7 deletionsDocumentation/power/runtime_pm.txt
- Documentation/power/s2ram.txt 7 additions, 0 deletionsDocumentation/power/s2ram.txt
- Documentation/power/swsusp.txt 2 additions, 1 deletionDocumentation/power/swsusp.txt
- drivers/base/power/Makefile 1 addition, 0 deletionsdrivers/base/power/Makefile
- drivers/base/power/generic_ops.c 2 additions, 2 deletionsdrivers/base/power/generic_ops.c
- drivers/base/power/main.c 13 additions, 8 deletionsdrivers/base/power/main.c
- drivers/base/power/opp.c 628 additions, 0 deletionsdrivers/base/power/opp.c
- drivers/base/power/power.h 2 additions, 0 deletionsdrivers/base/power/power.h
- drivers/base/power/runtime.c 503 additions, 441 deletionsdrivers/base/power/runtime.c
- drivers/base/power/sysfs.c 208 additions, 9 deletionsdrivers/base/power/sysfs.c
- drivers/base/power/trace.c 35 additions, 1 deletiondrivers/base/power/trace.c
- drivers/base/power/wakeup.c 535 additions, 78 deletionsdrivers/base/power/wakeup.c
- fs/sysfs/group.c 59 additions, 0 deletionsfs/sysfs/group.c
- include/linux/opp.h 105 additions, 0 deletionsinclude/linux/opp.h
Loading
Please register or sign in to comment