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_branch.c | |
| parent | f0461d0146ee30927bc7efa2ae24ea8c6693b725 (diff) | |
| parent | 061e41fdb5047b1fb161e89664057835935ca1d2 (diff) | |
| parent | 878719e831d9e076961aa15d4049a57a6668c67a (diff) | |
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.