]> www.infradead.org Git - nvme.git/commitdiff
projects / nvme.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9f68756 0890186)
Merge branch 'acpi-scan' into acpi-x86
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 4 Jan 2022 14:37:09 +0000 (15:37 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 4 Jan 2022 14:37:09 +0000 (15:37 +0100)
Merge recent device enumeration changes to satisfy dependencies.

1  2 
drivers/acpi/property.c patch | diff1 | diff2 | blob | history
drivers/acpi/x86/utils.c patch | diff1 | diff2 | blob | history
include/acpi/acpi_bus.h patch | diff1 | diff2 | blob | history

diff --cc drivers/acpi/property.c
Simple merge
diff --cc drivers/acpi/x86/utils.c
Simple merge
diff --cc include/acpi/acpi_bus.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.