From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Wed, 12 Feb 2014 11:56:56 +0000 (+0100)
Subject: Merge back earlier 'acpi-pci-hotplug' material.
X-Git-Tag: v3.15-rc1~151^2~14^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b49b9fe2b5220374ddc1c122cc31e00cc20365f;p=pandora-kernel.git

Merge back earlier 'acpi-pci-hotplug' material.

Conflicts:
	drivers/pci/hotplug/acpiphp_glue.c
---

4b49b9fe2b5220374ddc1c122cc31e00cc20365f
Reading git-diff-tree failed