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

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

diff --cc kernel/sched.c
Simple merge

diff --cc lib/Kconfig.debug
Simple merge

diff --cc mm/page_alloc.c
Simple merge

diff --cc mm/slab.c
Simple merge

diff --cc mm/slob.c
Simple merge

diff --cc mm/slub.c
Simple merge

diff --cc mm/vmscan.c
Simple merge