Merge branch 'linux-2.6'

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

diff --cc arch/powerpc/platforms/cell/spufs/sched.c
Simple merge

diff --cc drivers/char/ipmi/ipmi_si_intf.c
Simple merge

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