projects / cascardo / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e5e0243 4206223 8490fdf)
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)
* 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

1  2  3 
kernel/power/main.c patch | diff1 | diff2 | diff3 | blob | history

diff --cc kernel/power/main.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.