Merge branch 'pm-sleep' into acpi-pm
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 20 May 2014 11:22:15 +0000 (13:22 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 20 May 2014 11:22:15 +0000 (13:22 +0200)
commit55cc33ceb75643d190ed215f423972e0b7ae7aeb
treee9573d995bfae0f81ce800433b424bb998f90eca
parent1f0b63866fc1be700260547be8edf8e6f0af37f2
parentf71495f3f0c5f0801823d1235b271a4a415d3df8
Merge branch 'pm-sleep' into acpi-pm
kernel/power/suspend.c