diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-01-08 18:15:44 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-01-08 18:15:44 +0100 |
| commit | 24e8ab6886d80fe60b1d4e64b6d9f15ea9ad597a (patch) | |
| tree | d23fac1e92704faf846209a81d00f66bf034bd35 /arch/m68k/hp300 | |
| parent | aa7a1bb02bb44399be69b0a1cbb6495d9eec29fc (diff) | |
| parent | ee61cfd955a64a58ed35cbcfc54068fcbd486945 (diff) | |
| parent | 240bdc605e6a9d0309bd003de3413f6f729eca18 (diff) | |
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