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)
commitc029cc66cb3d83f70c02e0c182f0eed1419f8020
treeb9ed887a0e6434fedebcbf90b3d2ba1aeff68a01
parent0a9cb46a73abd6c45e7c986bec984eed60c417b6
parentba8f5baba79da8eb502f8534c3a8ecb64aceb790
Merge branch 'merge'
arch/powerpc/kernel/prom_init.c