Merge ../linux-2.6

diff --cc arch/powerpc/Kconfig
Simple merge

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

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

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

diff --cc arch/powerpc/platforms/powermac/feature.c
Simple merge

diff --cc arch/powerpc/platforms/powermac/setup.c
Simple merge