Merge branch 'pm-sleep'

Browse source

* pm-sleep:
  PM / hibernate: Iterate over set bits instead of PFNs in swsusp_free()
  PM / sleep: new suspend_resume trace event for console resume
  PM / sleep: Update test_suspend option documentation
  PM / sleep: Enhance test_suspend option with repeat capability
  PM / sleep: Support freeze as test_suspend option
  PM / sysfs: avoid shadowing variables

...

This commit is contained in:

Rafael J. Wysocki 2014-10-07 01:17:30 +02:00

parent 88b42a4883 fdd64ed54e

commit 0ede470030

5 changed files with 89 additions and 33 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

10

Documentation/kernel-parameters.txt

View file

24

drivers/base/power/sysfs.c

View file

52

kernel/power/snapshot.c

View file

2

kernel/power/suspend.c

View file

32

kernel/power/suspend_test.c

View file