diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-04-28 23:18:22 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-04-28 23:18:22 +0200 |
commit | 52e70c8af7e5d04e3fe431066f0530a17a8147c2 (patch) | |
tree | d3cfaf3ab07efed7b847e1ee59539a31fcb79cfa /drivers/power/supply | |
parent | Merge branches 'acpi-processor', 'acpi-cppc' and 'acpi-pmic' (diff) | |
parent | Merge back power-related ACPI material for v4.12. (diff) | |
parent | ACPI / blacklist: add _REV quirk for Dell Inspiron 7537 (diff) | |
parent | ACPI / video: add comments about subtle cases (diff) | |
parent | ACPI / doc: linuxized-acpica.txt: fix typos (diff) | |
download | linux-52e70c8af7e5d04e3fe431066f0530a17a8147c2.tar.xz linux-52e70c8af7e5d04e3fe431066f0530a17a8147c2.zip |
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