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

diff --cc drivers/acpi/sleep.c
Simple merge

diff --cc drivers/watchdog/Kconfig
index fdd3228e06781c4dd150091673e51ba3bdb9ce71,b4b3e256491bfbe8c05fa0f7830c003541db8720,616a0b2d77688ee03b138e09620d0442c27307ef..3eb58cb51e5648f87f5d732e33cde8c6cd49569d
--- 1/drivers/watchdog/Kconfig
--- 2/drivers/watchdog/Kconfig
--- 3/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@@@ -152,19 -153,6 -152,20 +152,20 @@@@ config TANGOX_WATCHDO
   
          This driver can be built as a module. The module name is tangox_wdt.
   
 + config WDAT_WDT
 +      tristate "ACPI Watchdog Action Table (WDAT)"
 +      depends on ACPI
++      select WATCHDOG_CORE
 +      select ACPI_WATCHDOG
 +      help
 +        This driver adds support for systems with ACPI Watchdog Action
 +        Table (WDAT) table. Servers typically have this but it can be
 +        found on some desktop machines as well. This driver will take
 +        over the native iTCO watchdog driver found on many Intel CPUs.
 + 
 +        To compile this driver as module, choose M here: the module will
 +        be called wdat_wdt.
 + 
   config WM831X_WATCHDOG
        tristate "WM831x watchdog"
        depends on MFD_WM831X