Merge remote-tracking branch 'pci/pci/gavin-window-alignment' into next

Merge Gavin patches from the PCI tree as subsequent powerpc
patches are going to depend on them

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

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