aboutsummaryrefslogtreecommitdiffstats
path: root/init/main.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-11-23 09:10:32 +0100
committerIngo Molnar <mingo@elte.hu>2008-11-23 09:10:32 +0100
commita0a70c735ef714fe1b6777b571630c3d50c7b008 (patch)
tree3f4f3bb23441a284107bede9890c4e45827634e0 /init/main.c
parentMerge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core (diff)
parentprofiling: clean up profile_nop() (diff)
parenttracing/function-return-tracer: add the overrun field (diff)
parentfunction tracing: fix wrong position computing of stack_trace (diff)
downloadlinux-dev-a0a70c735ef714fe1b6777b571630c3d50c7b008.tar.xz
linux-dev-a0a70c735ef714fe1b6777b571630c3d50c7b008.zip
Merge branches 'tracing/profiling', 'tracing/options' and 'tracing/urgent' into tracing/core