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)
commit3c06da5ae5358e9d325d541a053e1059e9654bcc
tree04c953cc82fe57cff248ac523095cd4f0d9611a7
parent4d1f3f25d9c303d1ce63b42cc94c54ac0ab2e950
parenta54c9d30dbb06391ec4422aaf0e1dc2c8c53bd3e
Merge ../linux-2.6
arch/powerpc/kernel/prom_init.c
arch/powerpc/platforms/pseries/setup.c