Merge remote-tracking branch 'pci/next'

diff --cc Documentation/devicetree/bindings/pci/designware-pcie.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

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

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

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