diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-04-29 00:18:22 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-04-29 00:18:22 +0300 |
| commit | 52e70c8af7e5d04e3fe431066f0530a17a8147c2 (patch) | |
| tree | d3cfaf3ab07efed7b847e1ee59539a31fcb79cfa /include/linux/acpi.h | |
| parent | 168f4a6950daabe1b9ee3845d70220dda8205c94 (diff) | |
| parent | 8494206dc5587c3204d12965c88cbf5f726ef94d (diff) | |
| parent | 2cff319e9666f534a7538aa1f4178d1f799b068a (diff) | |
| parent | 592c8095b834c86b0cc780de6501d156e0e92e36 (diff) | |
| parent | bf4f5bf131b67ef821e14de4ea92556e4d1fc852 (diff) | |
| download | linux-52e70c8af7e5d04e3fe431066f0530a17a8147c2.tar.xz | |
Merge branches 'acpi-power', 'acpi-blacklist', 'acpi-video' and 'acpi-doc'
* acpi-power:
power: supply: axp288_charger: Only wait for INT3496 device if present
ACPI / AC: Add a blacklist with PMIC ACPI HIDs with a native charger driver
ACPI / battery: Add a blacklist with PMIC ACPI HIDs with a native battery driver
ACPI / battery: Fix acpi_battery_exit on acpi_battery_init_async errors
ACPI / utils: Add new acpi_dev_present helper
* acpi-blacklist:
ACPI / blacklist: add _REV quirk for Dell Inspiron 7537
* acpi-video:
ACPI / video: add comments about subtle cases
ACPI / video: get rid of magic numbers and use enum instead
* acpi-doc:
ACPI / doc: linuxized-acpica.txt: fix typos