]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Merge branches 'acpi-ec' and 'acpi-x86'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 10 Apr 2020 09:31:43 +0000 (11:31 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 10 Apr 2020 09:31:43 +0000 (11:31 +0200)
* acpi-ec:
  ACPI: EC: Fix up fast path check in acpi_ec_add()

* acpi-x86:
  ACPI, x86/boot: make acpi_nobgrt static


Trivial merge