aboutsummaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-12-29 11:25:11 +0100
committerIngo Molnar <mingo@elte.hu>2008-12-29 11:25:11 +0100
commit0f01f07fad4ee11d98fe6faa442afbeb0328a378 (patch)
tree74140aedba4597718d270a5ccd74f0e38f32a22e /init
parentsysrq: fix ftrace help msg & doc. (diff)
parenttracing/function-graph-tracer: strip ending newlines on comments (diff)
parentMerge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc (diff)
downloadlinux-dev-0f01f07fad4ee11d98fe6faa442afbeb0328a378.tar.xz
linux-dev-0f01f07fad4ee11d98fe6faa442afbeb0328a378.zip
Merge branches 'tracing/docs', 'tracing/function-graph-tracer' and 'linus' into tracing/core