Merge remote-tracking branch 'pci/next'

diff --cc arch/powerpc/include/asm/machdep.h
Simple merge

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

diff --cc arch/powerpc/platforms/powernv/pci-ioda.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx4/main.c
Simple merge

diff --cc drivers/scsi/ipr.c
Simple merge