Merge commit 'v2.6.29-rc1' into tracing/urgent
Ingo Molnar [Sun, 11 Jan 2009 02:43:52 +0000 (03:43 +0100)]
1  2 
Documentation/kernel-parameters.txt
MAINTAINERS
drivers/char/sysrq.c
init/main.c
mm/slub.c

Simple merge
diff --cc MAINTAINERS
Simple merge
Simple merge
diff --cc init/main.c
Simple merge
diff --cc mm/slub.c
Simple merge