git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aa7a1bb ee61cfd 240bdc6)
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
Unnamed repository; edit this file 'description' to name the repository.