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)
commit0c95fbb25602caa02ef697c3852cd61f9829e6ff
treecdab09f60b9bf00864af24fcf1da408b07b91aa1
parent49b09853df1a303876b82a6480efb2f7b45ef041
parent06a98dba0d4b4f2f9b1f35f636beb166d6cbde34
Merge git://oak/home/sfr/kernels/iseries/work
arch/powerpc/kernel/prom.c
arch/powerpc/platforms/iseries/setup.c