Merge branches 'tracing/doc', 'tracing/ftrace', 'tracing/printk' and 'tracing/textedi...
Ingo Molnar [Sun, 8 Mar 2009 15:48:51 +0000 (16:48 +0100)]
1  2 
include/asm-generic/vmlinux.lds.h
lib/Kconfig

Simple merge
diff --cc lib/Kconfig
Simple merge