summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2021-09-10 21:27:07 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2021-09-10 21:27:07 +0300
commit8fbc1c5b91133f7ae5254061d2cb3326992635c4 (patch)
tree89385f2b51751d83b0c72a51f4284d3bf2aab5e8 /drivers
parent22d692baba0a899bc448d2f90ad006a5b04d99a8 (diff)
parent66e0aeaa8bae6d464f7bcd2767c10c8c84658362 (diff)
parent3265cc3ec52e75fc8daf189954cebda27ad26b2e (diff)
downloadlinux-8fbc1c5b91133f7ae5254061d2cb3326992635c4.tar.xz
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