diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-07-27 23:56:30 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-07-27 23:56:30 +0200 |
| commit | bb1c095f7367bbf4983dbee32b2f83f59df3b310 (patch) | |
| tree | 4608afd50f2b24d64642d88223a906df73cb2c29 /kernel/power/main.c | |
| parent | e5e0243e362c86f3694a140779949251e112c39e (diff) | |
| parent | 42062234cb7b4177ed6ed1a374b36356fc4d230f (diff) | |
| parent | 8490fdf923fc6cf6c31a53b73cafdf582a9642f0 (diff) | |
| download | linux-bb1c095f7367bbf4983dbee32b2f83f59df3b310.tar.bz2 | |
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