diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-04-10 11:31:43 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-04-10 11:31:43 +0200 |
| commit | 0214da7cce2030f1a71fb555e2967faf3b92aebf (patch) | |
| tree | 0ff7fe915cec4160a0e8be29f311b528e4dfd1b6 /arch/x86 | |
| parent | 6de084803074dcead5da5bf5c82d189b4cf4b6b5 (diff) | |
| parent | d7e0481c0d0f0d2e73d4f1e675cb89d0308d0f7c (diff) | |
| parent | b5432a699fdff9266a475771bd46d740f40f76aa (diff) | |
| download | linux-0214da7cce2030f1a71fb555e2967faf3b92aebf.tar.bz2 | |
Merge branches 'acpi-ec' and 'acpi-x86'
* acpi-ec:
ACPI: EC: Fix up fast path check in acpi_ec_add()
* acpi-x86:
ACPI, x86/boot: make acpi_nobgrt static