OSDN Git Service

Merge remote-tracking branch 'pci/pci/gavin-window-alignment' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Mon, 17 Sep 2012 06:07:43 +0000 (16:07 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Mon, 17 Sep 2012 06:07:43 +0000 (16:07 +1000)
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>
1  2 
arch/powerpc/include/asm/machdep.h
arch/powerpc/kernel/pci-common.c
arch/powerpc/platforms/powernv/pci-ioda.c

Simple merge
Simple merge