Merge remote-tracking branch 'kumar/next' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 25 Nov 2011 04:25:39 +0000 (15:25 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 25 Nov 2011 04:25:39 +0000 (15:25 +1100)
1  2 
arch/powerpc/kernel/pci-common.c
arch/powerpc/platforms/85xx/mpc85xx_cds.c

Simple merge