]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Merge branches 'acpi-scan' and 'acpi-misc'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 8 Jan 2021 17:15:44 +0000 (18:15 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 8 Jan 2021 17:15:44 +0000 (18:15 +0100)
* acpi-scan:
  ACPI: scan: add stub acpi_create_platform_device() for !CONFIG_ACPI

* acpi-misc:
  ACPI: Update Kconfig help text for items that are no longer modular


Trivial merge