Merge branch 'merge'
authorPaul Mackerras <paulus@samba.org>
Thu, 1 Jun 2006 09:05:23 +0000 (19:05 +1000)
committerPaul Mackerras <paulus@samba.org>
Thu, 1 Jun 2006 09:05:23 +0000 (19:05 +1000)
1  2 
arch/powerpc/kernel/prom_init.c

Simple merge