Merge branches 'pm-apm' and 'pm-sleep'

Browse source

* pm-apm:
  x86, apm: Remove unused variable

* pm-sleep:
  PM / sleep: Move platform suspend operations to separate functions
  PM / sleep: Simplify sleep states sysfs interface code

...

This commit is contained in:

Rafael J. Wysocki 2014-07-27 23:56:30 +02:00

parent e5e0243e36 42062234cb 8490fdf923

commit bb1c095f73

4 changed files with 108 additions and 84 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

21

kernel/power/main.c

View file

7

kernel/power/power.h

View file

152

kernel/power/suspend.c

View file

12

kernel/power/suspend_test.c

View file