Merge remote-tracking branch 'jwb/next' into next
Benjamin Herrenschmidt [Tue, 30 Aug 2011 05:14:46 +0000 (15:14 +1000)]
1  2 
arch/powerpc/sysdev/ppc4xx_pci.c

Simple merge