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)
commit24e8ab6886d80fe60b1d4e64b6d9f15ea9ad597a
treed23fac1e92704faf846209a81d00f66bf034bd35
parentaa7a1bb02bb44399be69b0a1cbb6495d9eec29fc
parentee61cfd955a64a58ed35cbcfc54068fcbd486945
parent240bdc605e6a9d0309bd003de3413f6f729eca18
Merge branches 'acpi-scan' and 'acpi-misc'

* 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