Merge branches 'acpi-scan' and 'acpi-prm'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 10 Sep 2021 18:27:07 +0000 (20:27 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 10 Sep 2021 18:27:07 +0000 (20:27 +0200)
commit8fbc1c5b91133f7ae5254061d2cb3326992635c4
tree89385f2b51751d83b0c72a51f4284d3bf2aab5e8
parent22d692baba0a899bc448d2f90ad006a5b04d99a8
parent66e0aeaa8bae6d464f7bcd2767c10c8c84658362
parent3265cc3ec52e75fc8daf189954cebda27ad26b2e
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