]> err.no Git - linux-2.6/commitdiff
Merge branch 'mpe'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 14 Jul 2006 07:27:26 +0000 (17:27 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 14 Jul 2006 07:27:26 +0000 (17:27 +1000)
1  2 
arch/powerpc/platforms/iseries/dt.c

Simple merge