From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Wed, 29 Jul 2015 21:57:51 +0000 (+0200)
Subject: Merge branch 'acpi-scan' into acpi-pm
X-Git-Tag: omap-for-v4.3/fixes-rc1~121^2~7^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3431e490b50356b56084305a2e93b3a980802b22;p=pandora-kernel.git

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.
---

3431e490b50356b56084305a2e93b3a980802b22
Reading git-diff-tree failed