Merge remote-tracking branch '4xx/next'
commitc88066d1ce241964427e039a8cd74d306b8f2e99
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 24 Aug 2011 01:59:56 +0000 (24 11:59 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 24 Aug 2011 01:59:56 +0000 (24 11:59 +1000)
tree8ce742239e4337cb0a8812e168931b1c88333e04
parent8bb7f45646610201f4a922be91cf42664b4310dc
parent9fcd768d0cc88b41ea459e25d2db12d3e25fa9dd
Merge remote-tracking branch '4xx/next'
arch/powerpc/sysdev/ppc4xx_pci.c