projects / firefly-linux-kernel-4.4.55.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5af310a 1dcc3d3)
Merge branch 'acpi-scan' into acpi-pm
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 29 Jul 2015 21:57:51 +0000 (23:57 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 29 Jul 2015 21:57:51 +0000 (23:57 +0200)
commit3431e490b50356b56084305a2e93b3a980802b22
treeda5213c3c05df56711a097c95e8a1410a46df78dtree | snapshot
parent5af310a8ee70dd6a588c8ee1d4487a230a7b7b65commit | diff
parent1dcc3d3362b0c97e48290f7786be85b4cec2a147commit | diff
Merge branch 'acpi-scan' into acpi-pm

Conflicts:
drivers/acpi/scan.c

The conflict is resolved by moving the just introduced
acpi_device_is_first_physical_node() to bus.c and using
the existing acpi_companion_match() from there.

There will be an additional commit to combine the two.
drivers/acpi/bus.c diff1 | diff2 | blob | history
drivers/acpi/internal.h diff1 | diff2 | blob | history
drivers/acpi/scan.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.