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

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

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

diff --cc kernel/irq/manage.c
Simple merge

diff --cc kernel/lockdep.c
Simple merge

diff --cc kernel/sched.c
Simple merge