tree da5213c3c05df56711a097c95e8a1410a46df78d
parent 5af310a8ee70dd6a588c8ee1d4487a230a7b7b65
parent 1dcc3d3362b0c97e48290f7786be85b4cec2a147
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1438207071 +0200
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1438207071 +0200

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.