diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2008-12-03 08:54:47 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-03 08:55:34 +0100 |
| commit | dfdc5437bd62dd6a26961e27f26b671374749875 (patch) | |
| tree | 730ddeccfc74ca11b738a69e4d96644bc047e946 /kernel/trace/trace_stack.c | |
| parent | Merge branches 'tracing/ftrace' and 'tracing/function-graph-tracer' into tracing/core (diff) | |
| parent | Linux 2.6.28-rc7 (diff) | |
| parent | x86: unify appropriate bits from dumpstack_32 and dumpstack_64 (diff) | |
| download | linux-dev-dfdc5437bd62dd6a26961e27f26b671374749875.tar.xz linux-dev-dfdc5437bd62dd6a26961e27f26b671374749875.zip | |
Merge commit 'v2.6.28-rc7'; branch 'x86/dumpstack' into tracing/ftrace
Merge x86/dumpstack into tracing/ftrace because upcoming ftrace changes
depend on cleanups already in x86/dumpstack.
Also merge to latest upstream -rc.