]> git.baikalelectronics.ru Git - 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)
commit657b2987c718b9389770bbf0b3589e47440834e8
treef4854cdcd438fdecf8fb6c8e093d2b6ff90418ad
parentda18b8878f7e63800cfd92908a6551238ca6466f
parent38914d14b57a046753445eeea07c20fe3385f309
parent0e407ad4f971e4afbd427ee9d29a3b526aa438b0
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