]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
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)
1  2 
drivers/acpi/sleep.c

Simple merge