diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-09-22 23:38:45 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-09-22 23:38:45 +0200 |
commit | 672d0e4502a22364b298f9307f651c1b8313514b (patch) | |
tree | f0c215936257353d81c3a267e2f47106ab2065fe /drivers/acpi | |
parent | 096a2c610df279d001a8f61faa3eb7f98ca6196b (diff) | |
parent | 9e987b70ada27554c5d176421de1d167218c49b5 (diff) | |
parent | 6ce14f6416c84bd9c81777edf899b57ac5000c87 (diff) | |
parent | 0c0bceb796878a5baea1f47033215fac0774e498 (diff) | |
download | linux-672d0e4502a22364b298f9307f651c1b8313514b.tar.bz2 |
Merge branches 'acpi-pmic', 'acpi-bus', 'acpi-wdat' and 'acpi-properties'
* acpi-pmic:
ACPI / PMIC: Add code reviewers to MAINTAINERS
* acpi-bus:
ACPI / bus: Make ACPI_HANDLE() work for non-GPL code again
* acpi-wdat:
ACPI / watchdog: properly initialize resources
* acpi-properties:
ACPI: properties: Return _DSD hierarchical extension (data) sub-nodes correctly