Merge ../linux-2.6
authorPaul Mackerras <paulus@samba.org>
Mon, 7 Nov 2005 03:42:09 +0000 (14:42 +1100)
committerPaul Mackerras <paulus@samba.org>
Mon, 7 Nov 2005 03:42:09 +0000 (14:42 +1100)
commitc6135234550ed89a6fd0e8cb229633967e41d649
tree22cef33e314839c4fb30d6fc888c0caa2a0f6602
parent76032de898f34db55b5048349db56557828a1390
parent0b154bb7d0cce80e9c0bcf11d4f9e71b59409d26
Merge ../linux-2.6
arch/powerpc/kernel/process.c
arch/powerpc/kernel/setup_64.c
arch/powerpc/mm/hash_utils_64.c
arch/powerpc/mm/init_64.c
arch/powerpc/mm/pgtable_64.c
arch/powerpc/platforms/iseries/setup.c
arch/powerpc/platforms/pseries/lpar.c
arch/ppc64/kernel/prom.c
include/asm-powerpc/machdep.h