Merge remote-tracking branch 'pci/next'

Conflicts:
	arch/s390/pci/pci_sysfs.c

diff --cc MAINTAINERS
Simple merge

diff --cc arch/powerpc/kernel/pci-common.c
Simple merge

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

diff --cc arch/sparc/include/asm/pci_64.h
Simple merge

diff --cc arch/sparc/kernel/pci.c
Simple merge

diff --cc drivers/misc/genwqe/card_utils.c
Simple merge

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

diff --cc include/linux/dma-mapping.h
Simple merge