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)
commit3eba148d75670f61463dd3c9ef8672da8f290f36
tree45cb8fbda6d6ce9d73aeeac673282e37b0be2531
parent057b0a7518e4b8fca26201715996d6d928a62300
parent4cf563c5d97c83d4b2fb3a778dd7d5e362cc3e34
Merge branch 'acpi-pm' into pm-sleep
kernel/power/suspend.c