Merge branches 'tracing/ftrace', 'tracing/fastboot', 'tracing/nmisafe' and 'tracing...
authorIngo Molnar <mingo@elte.hu>
Sat, 8 Nov 2008 08:34:35 +0000 (09:34 +0100)
committerIngo Molnar <mingo@elte.hu>
Sat, 8 Nov 2008 08:34:35 +0000 (09:34 +0100)
commita6b0786f7f83bcc4d414a2977aaebe2941ebe1de
treefd7cbdda3de7eaf05eaa01eb3609121cc05828d8
parent3e03fb7f1da2e691644526c0d6df42d778716349
parent6a60dd121c5b6c2d827e99b38c1326f2600c3891
parent072ba49838b42c873c496d72c91bb237914cf3b6
Merge branches 'tracing/ftrace', 'tracing/fastboot', 'tracing/nmisafe' and 'tracing/urgent' into tracing/core
arch/x86/Kconfig
arch/x86/mm/Makefile
include/linux/ftrace.h
kernel/trace/ring_buffer.c
kernel/trace/trace.c