From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 8 Jan 2021 17:15:44 +0000 (+0100)
Subject: Merge branches 'acpi-scan' and 'acpi-misc'
X-Git-Tag: microblaze-v5.13~420^2
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=24e8ab6886d80fe60b1d4e64b6d9f15ea9ad597a;p=linux-2.6-microblaze.git

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
---

24e8ab6886d80fe60b1d4e64b6d9f15ea9ad597a