From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 31 Dec 2013 12:41:08 +0000 (+0100)
Subject: Merge branch 'acpi-pci-hotplug' into acpi-hotplug
X-Git-Tag: v3.14-rc1~107^2~11^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1badf8d4323cfc9325b06651bdfcf7df09f1f0e;p=pandora-kernel.git

Merge branch 'acpi-pci-hotplug' into acpi-hotplug

Conflicts:
	include/acpi/acpi_bus.h
---

d1badf8d4323cfc9325b06651bdfcf7df09f1f0e
Reading git-diff-tree failed