Merge branch 'pm-sleep' into pm-docs
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 28 Aug 2017 22:15:47 +0000 (00:15 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 28 Aug 2017 22:15:47 +0000 (00:15 +0200)
commitcba630b6f5cf6bb468f5c2da77f3dee2125bd0c1
treefa2197409bddcf6faaf084cb64895f4c531bfa73
parent0c0b6b7bc427caed77b172916edc3c36cd1ab79d
parent726fb6b4f2a82a14a906f39bdabac4863b87c01a
Merge branch 'pm-sleep' into pm-docs
drivers/acpi/sleep.c