From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Sun, 27 Jul 2014 21:56:30 +0000 (+0200)
Subject: Merge branches 'pm-apm' and 'pm-sleep'
X-Git-Tag: v3.17-rc1~99^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bb1c095f7367bbf4983dbee32b2f83f59df3b310;p=thirdparty%2Fkernel%2Flinux.git

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
---

bb1c095f7367bbf4983dbee32b2f83f59df3b310