]> err.no Git - linux-2.6/commitdiff
Merge git://oak/home/sfr/kernels/iseries/work
authorPaul Mackerras <paulus@samba.org>
Thu, 10 Nov 2005 04:54:00 +0000 (15:54 +1100)
committerPaul Mackerras <paulus@samba.org>
Thu, 10 Nov 2005 04:54:00 +0000 (15:54 +1100)
1  2 
arch/powerpc/kernel/prom.c
arch/powerpc/platforms/iseries/setup.c

Simple merge