diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-09-10 20:27:07 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-09-10 20:27:07 +0200 |
| commit | 8fbc1c5b91133f7ae5254061d2cb3326992635c4 (patch) | |
| tree | 89385f2b51751d83b0c72a51f4284d3bf2aab5e8 /drivers | |
| parent | 22d692baba0a899bc448d2f90ad006a5b04d99a8 (diff) | |
| parent | 66e0aeaa8bae6d464f7bcd2767c10c8c84658362 (diff) | |
| parent | 3265cc3ec52e75fc8daf189954cebda27ad26b2e (diff) | |
| download | linux-8fbc1c5b91133f7ae5254061d2cb3326992635c4.tar.bz2 | |
Merge branches 'acpi-scan' and 'acpi-prm'
* acpi-scan:
ACPI: scan: Remove unneeded header linux/nls.h
* acpi-prm:
ACPI: PRM: Find PRMT table before parsing it