]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branches 'acpi-sleep-fixes' and 'acpi-wdat-fixes'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 25 Nov 2016 21:24:07 +0000 (22:24 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 25 Nov 2016 21:24:07 +0000 (22:24 +0100)
commit7e5c07af8693e72b23aefb70da88b31b30c35b22
treef4854cdcd438fdecf8fb6c8e093d2b6ff90418ad
parent9c763584b7c8911106bb77af7e648bef09af9d80
parent9713adc2a1a5488f4889c657a0c0ce0c16056d3c
parenteffb46b40f8053fd19698daf9e6b5833cabeba29
Merge branches 'acpi-sleep-fixes' and 'acpi-wdat-fixes'

* acpi-sleep-fixes:
  Revert "ACPI: Execute _PTS before system reboot"

* acpi-wdat-fixes:
  watchdog: wdat_wdt: Select WATCHDOG_CORE
drivers/acpi/sleep.c
drivers/watchdog/Kconfig