Merge ../linux-2.6

diff --cc arch/powerpc/kernel/asm-offsets.c
Simple merge

diff --cc arch/powerpc/kernel/cputable.c
Simple merge

diff --cc arch/powerpc/kernel/entry_64.S
Simple merge

diff --cc arch/powerpc/kernel/head_64.S
Simple merge

diff --cc arch/powerpc/kernel/signal_64.c
Simple merge

diff --cc arch/powerpc/kernel/vdso.c
Simple merge

diff --cc include/asm-powerpc/cputable.h
Simple merge

diff --cc include/asm-powerpc/pgtable-4k.h
Simple merge