Merge remote-tracking branch 'pci/next'

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

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

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

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

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