Merge commit 'v2.6.29-rc7' into core/locking
Ingo Molnar [Thu, 5 Mar 2009 10:45:22 +0000 (11:45 +0100)]
1  2 
include/linux/sched.h
kernel/sched.c
lib/Kconfig.debug
mm/page_alloc.c
mm/slab.c
mm/slob.c
mm/slub.c
mm/vmscan.c

Simple merge
diff --cc kernel/sched.c
Simple merge
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