Merge remote-tracking branch 'jwb/next' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 30 Aug 2011 05:14:46 +0000 (15:14 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 30 Aug 2011 05:14:46 +0000 (15:14 +1000)
commit9bb7361d99fb5c510e62b521e4292581fa1bee98
treef9a4797a2e97006947011fcdbf8677a84fbdf182
parentc6a389f123b9f68d605bb7e0f9b32ec1e3e14132
parent9fcd768d0cc88b41ea459e25d2db12d3e25fa9dd
Merge remote-tracking branch 'jwb/next' into next
arch/powerpc/sysdev/ppc4xx_pci.c