]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch '4xx/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 22 Aug 2011 01:10:42 +0000 (11:10 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 22 Aug 2011 01:10:42 +0000 (11:10 +1000)
1  2 
arch/powerpc/sysdev/ppc4xx_pci.c

Simple merge