Merge remote-tracking branch 'pci/next'

diff --cc arch/powerpc/kernel/eeh_driver.c
Simple merge

diff --cc arch/s390/pci/pci.c
Simple merge

diff --cc drivers/acpi/pci_root.c
Simple merge

diff --cc drivers/ata/ahci.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_gem_gtt.c
Simple merge

diff --cc drivers/pci/host/pci-tegra.c
Simple merge

diff --cc drivers/pci/hotplug/acpiphp_glue.c
Simple merge

diff --cc drivers/pci/pci-acpi.c
Simple merge

diff --cc drivers/pci/pci.c
Simple merge

diff --cc drivers/pci/quirks.c
Simple merge

diff --cc drivers/platform/x86/eeepc-laptop.c
Simple merge

diff --cc include/linux/pci.h
Simple merge