tree 4608afd50f2b24d64642d88223a906df73cb2c29
parent e5e0243e362c86f3694a140779949251e112c39e
parent 42062234cb7b4177ed6ed1a374b36356fc4d230f
parent 8490fdf923fc6cf6c31a53b73cafdf582a9642f0
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1406498190 +0200
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1406498190 +0200

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