Merge http://linus.bkbits.net/linux-2.5

into dhcp212.munich.sgi.com:/home/hch/repo/bk/linux-2.5-xfs

diff --cc include/linux/sched.h
Simple merge

diff --cc include/linux/sysctl.h
Simple merge

diff --cc kernel/ksyms.c
Simple merge