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)
1  2 
kernel/power/suspend.c

Simple merge