diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-10-02 02:40:07 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-10-02 02:40:07 +0300 |
| commit | 0137a337d7760c265a7d126964297e41ba9a1cb3 (patch) | |
| tree | e9555ae881bce01426a20caad138a9ac3786364b /include/linux/acpi.h | |
| parent | 0d573c6a01011e61dc9f4594ef5d6d52f35f45db (diff) | |
| parent | cda3b9178510297ac968b7e129e20caaaa66c581 (diff) | |
| parent | 97cb159fd91d00f8d7d1adeb075503dc0d946bff (diff) | |
| download | linux-0137a337d7760c265a7d126964297e41ba9a1cb3.tar.xz | |
Merge branches 'acpi-wdat' and 'acpi-ec'
* acpi-wdat:
watchdog: wdat_wdt: Fix warning for using 0 as NULL
watchdog: wdat_wdt: fix return value check in wdat_wdt_probe()
platform/x86: intel_pmc_ipc: Do not create iTCO watchdog when WDAT table exists
i2c: i801: Do not create iTCO watchdog when WDAT table exists
mfd: lpc_ich: Do not create iTCO watchdog when WDAT table exists
ACPI / watchdog: Add support for WDAT hardware watchdog
* acpi-ec:
ACPI / EC: Fix issues related to boot_ec
ACPI / EC: Fix a gap that ECDT EC cannot handle EC events
ACPI / EC: Fix a memory leakage issue in acpi_ec_add()
ACPI / EC: Cleanup first_ec/boot_ec code
ACPI / EC: Enable event freeze mode to improve event handling for suspend process
ACPI / EC: Add PM operations to improve event handling for suspend process
ACPI / EC: Add PM operations to improve event handling for resume process
ACPI / EC: Fix an issue that SCI_EVT cannot be detected after event is enabled
ACPI / EC: Add EC_FLAGS_QUERY_ENABLED to reveal a hidden logic
ACPI / EC: Add PM operations for suspend/resume noirq stage