summaryrefslogtreecommitdiffstats
path: root/init/Kconfig
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-11-18 08:52:13 +0100
committerIngo Molnar <mingo@elte.hu>2008-11-18 08:52:13 +0100
commit5a209c2d58e70f9bc415b9cdf0e3b9aaefb70371 (patch)
tree02e63e90cc26792eaea21dced12bd7c10f996d30 /init/Kconfig
parentMerge branches 'tracing/branch-tracer', 'tracing/ftrace', 'tracing/function-r... (diff)
parenttracing: branch tracer, fix writing to trace/trace_options (diff)
parentkernel/profile.c: fix section mismatch warning (diff)
downloadlinux-5a209c2d58e70f9bc415b9cdf0e3b9aaefb70371.tar.xz
linux-5a209c2d58e70f9bc415b9cdf0e3b9aaefb70371.zip
Merge branches 'tracing/branch-tracer' and 'tracing/urgent' into tracing/core