Merge commit 'v2.6.28-rc2' into core/locking

Conflicts:
	arch/um/include/asm/system.h

diff --cc arch/um/include/asm/system.h
Simple merge

diff --cc arch/x86/include/asm/uaccess.h
Simple merge

diff --cc arch/x86/include/asm/uaccess_32.h
Simple merge

diff --cc arch/x86/include/asm/uaccess_64.h
Simple merge

diff --cc arch/x86/lib/usercopy_32.c
Simple merge

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

diff --cc kernel/sched.c
Simple merge

diff --cc mm/memory.c
Simple merge