]> git.baikalelectronics.ru Git - kernel.git/commitdiff
projects / kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0ef86b2 9304119 f854ab5)
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)
* acpi-scan:
  ACPI: scan: Remove unneeded header linux/nls.h

* acpi-prm:
  ACPI: PRM: Find PRMT table before parsing it


Trivial merge
Linux Kernel Source Tree.