Merge branch 'acpi-pm' into pm-sleep
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 6 Jun 2014 22:17:50 +0000 (00:17 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 6 Jun 2014 22:17:50 +0000 (00:17 +0200)
1  2 
kernel/power/suspend.c

Simple merge