diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-05-09 23:23:02 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-05-09 23:23:02 +0200 |
commit | 46436eb2f9e6ab0770c14292296d133f8907f699 (patch) | |
tree | fb3145607005652d6150bbc7aaa5fa5085d04438 /drivers/acpi/sleep.c | |
parent | 8269c734049cf4869c99d63c5d94774db37ca190 (diff) | |
parent | 04434ab5120a362c11ae6e6cf196fc6a98c3365d (diff) | |
parent | 753a448c27a0238dc1db58cd6954e8ef511a97e1 (diff) | |
parent | 2bde7c32b1db162692f05c6be066b5bcd3d9fdbe (diff) | |
parent | 8ece1d83346bcc431090d59a2184276192189cdd (diff) | |
download | linux-46436eb2f9e6ab0770c14292296d133f8907f699.tar.bz2 |
Merge branches 'acpi-soc', 'acpi-bus', 'acpi-pmic' and 'acpi-power'
* acpi-soc:
ACPI / LPSS: Call pwm_add_table() for Bay Trail PWM device
i2c: designware: Add ACPI HID for Hisilicon Hip07/08 I2C controller
ACPI / APD: Add clock frequency for Hisilicon Hip07/08 I2C controller
* acpi-bus:
ACPI / bus: Add INT0002 to list of always-present devices
ACPI / bus: Introduce a list of ids for "always present" devices
* acpi-pmic:
ACPI / PMIC: xpower: Fix power_table addresses
* acpi-power:
ACPI / power: Delay turning off unused power resources after suspend