diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-19 10:04:25 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-19 10:04:25 +0100 |
| commit | 9676e73a9e0cbdc521e1ebf4e13e6e5aada34247 (patch) | |
| tree | b5ea1cace6c4f2f57fcebfc42418b7f53fee84e5 /init/Kconfig | |
| parent | Merge branches 'tracing/branch-tracer' and 'tracing/urgent' into tracing/core (diff) | |
| parent | ftrace: fix selftest locking (diff) | |
| parent | Merge branch 'tip/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/ro... (diff) | |
| download | linux-9676e73a9e0cbdc521e1ebf4e13e6e5aada34247.tar.xz linux-9676e73a9e0cbdc521e1ebf4e13e6e5aada34247.zip | |
Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core
Conflicts:
kernel/trace/ftrace.c
[ We conflicted here because we backported a few fixes to
tracing/urgent - which has different internal APIs. ]