Merge ../linux-2.6
authorPaul Mackerras <paulus@samba.org>
Fri, 19 May 2006 05:02:42 +0000 (15:02 +1000)
committerPaul Mackerras <paulus@samba.org>
Fri, 19 May 2006 05:02:42 +0000 (15:02 +1000)
1  2 
arch/powerpc/kernel/prom_init.c
arch/powerpc/platforms/pseries/setup.c

Simple merge