diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-12-04 10:24:33 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-12-04 10:24:33 +0100 |
| commit | b65d56305c6f5c74b1b4fcaf55d48e949e49d67c (patch) | |
| tree | b3aec5d910c0a6bccca5c38d949c35392f345edd | |
| parent | 833a426cc471b6088011b3d67f1dc4e147614647 (diff) | |
| parent | 627ead724eff33673597216f5020b72118827de4 (diff) | |
| parent | 90ed9c639c1b53556f87b1c5031c7e4c57285a92 (diff) | |
| parent | a7583e72a5f22470d3e6fd3b6ba912892242339f (diff) | |
| parent | feb174069fd72ca92feca7fb3a57752f86986a4c (diff) | |
| download | linux-b65d56305c6f5c74b1b4fcaf55d48e949e49d67c.tar.bz2 | |
Merge branches 'acpi-bus', 'acpi-button', 'acpi-sysfs' and 'acpi-misc'
* acpi-bus:
ACPI: bus: Fix NULL pointer check in acpi_bus_get_private_data()
* acpi-button:
ACPI: button: Add DMI quirk for Acer Switch 10 SW5-032 lid-switch
* acpi-sysfs:
ACPI: sysfs: Change ACPI_MASKABLE_GPE_MAX to 0x100
* acpi-misc:
ACPI: Fix Kconfig indentation