OSDN Git Service

Merge branches 'pm-apm' and 'pm-sleep'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 27 Jul 2014 21:56:30 +0000 (23:56 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 27 Jul 2014 21:56:30 +0000 (23:56 +0200)
commitbb1c095f7367bbf4983dbee32b2f83f59df3b310
tree4608afd50f2b24d64642d88223a906df73cb2c29
parente5e0243e362c86f3694a140779949251e112c39e
parent42062234cb7b4177ed6ed1a374b36356fc4d230f
parent8490fdf923fc6cf6c31a53b73cafdf582a9642f0
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
kernel/power/main.c