diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-11-25 22:24:07 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-11-25 22:24:07 +0100 |
| commit | 7e5c07af8693e72b23aefb70da88b31b30c35b22 (patch) | |
| tree | f4854cdcd438fdecf8fb6c8e093d2b6ff90418ad | |
| parent | 9c763584b7c8911106bb77af7e648bef09af9d80 (diff) | |
| parent | 9713adc2a1a5488f4889c657a0c0ce0c16056d3c (diff) | |
| parent | effb46b40f8053fd19698daf9e6b5833cabeba29 (diff) | |
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