Rafael J. Wysocki 3431e490b5 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.

2015-07-29 23:57:51 +02:00

48 KiB

Raw Blame History

View Raw