Merge bk://linux.bkbits.net/linux-2.5

into kernel.bkbits.net:/home/mochel/linux-2.5-power

diff --cc kernel/sched.c
Simple merge

diff --cc kernel/sys.c
Simple merge