]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-client.git/commitdiff
Merge back earlier suspend/hibernation changes for v4.11.
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 30 Jan 2017 08:00:02 +0000 (09:00 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 30 Jan 2017 08:00:02 +0000 (09:00 +0100)
1  2 
drivers/acpi/sleep.c

Simple merge