git.baikalelectronics.ru Git - kernel.git/commit

author	Rafael J. Wysocki <rafael.j.wysocki@intel.com>
	Sun, 27 Jul 2014 21:56:30 +0000 (23:56 +0200)
committer	Rafael J. Wysocki <rafael.j.wysocki@intel.com>
	Sun, 27 Jul 2014 21:56:30 +0000 (23:56 +0200)
commit	a49ea12c7ac6138f80b9c2875124cdcf08a4eee9
tree	4608afd50f2b24d64642d88223a906df73cb2c29	tree \| snapshot
parent	4a3e46fbdec0cdc58e69fa52dd66388b9efda664	commit \| diff
parent	95ebcc35a0bea88c2cca64bbec5acc040694d75e	commit \| diff
parent	45d55a5593fe00c16dd982d1ccfb17525ee2bbfe	commit \| 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