]> err.no Git - linux-2.6/commitdiff
Merge iSeries include file move
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 2 Nov 2005 05:06:03 +0000 (16:06 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 2 Nov 2005 05:06:03 +0000 (16:06 +1100)
1  2 
arch/powerpc/kernel/setup_64.c
arch/powerpc/platforms/iseries/setup.c
arch/ppc64/kernel/irq.c

Simple merge
Simple merge