summaryrefslogtreecommitdiff
path: root/kernel/power/main.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-07-27 23:56:30 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-07-27 23:56:30 +0200
commitbb1c095f7367bbf4983dbee32b2f83f59df3b310 (patch)
tree4608afd50f2b24d64642d88223a906df73cb2c29 /kernel/power/main.c
parente5e0243e362c86f3694a140779949251e112c39e (diff)
parent42062234cb7b4177ed6ed1a374b36356fc4d230f (diff)
parent8490fdf923fc6cf6c31a53b73cafdf582a9642f0 (diff)
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