Merge kroah.com:/home/greg/linux/BK/bleeding_edge-2.5

into kroah.com:/home/greg/linux/BK/lsm-2.5

diff --cc arch/ppc/kernel/misc.S
Simple merge

diff --cc fs/file_table.c
Simple merge

diff --cc fs/proc/base.c
Simple merge

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

diff --cc init/do_mounts.c
Simple merge

diff --cc kernel/exit.c
Simple merge

diff --cc kernel/fork.c
Simple merge

diff --cc kernel/sched.c
Simple merge

diff --cc kernel/sys.c
Simple merge