diff options
author | 2014-07-27 23:56:30 +0200 | |
---|---|---|
committer | 2014-07-27 23:56:30 +0200 | |
commit | bb1c095f7367bbf4983dbee32b2f83f59df3b310 (patch) | |
tree | 4608afd50f2b24d64642d88223a906df73cb2c29 /tools/perf/scripts/python | |
parent | Merge branches 'acpi-video' and 'acpi-hotplug' (diff) | |
parent | Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm into pm-apm (diff) | |
parent | PM / sleep: Move platform suspend operations to separate functions (diff) | |
download | linux-dev-bb1c095f7367bbf4983dbee32b2f83f59df3b310.tar.xz linux-dev-bb1c095f7367bbf4983dbee32b2f83f59df3b310.zip |
Merge branches 'pm-apm' and 'pm-sleep'
* 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