diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-10 22:54:23 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-10 22:54:23 +0100 |
commit | 4dd163a0512eb91bbcf4e66d2f65b8e4042561b3 (patch) | |
tree | 88f8f450ef038c36f3620c79635b2e22e3b0528a /Documentation | |
parent | trace_clock: fix preemption bug (diff) | |
parent | x86: expand irq-off region in text_poke() (diff) | |
parent | Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/c... (diff) | |
download | linux-4dd163a0512eb91bbcf4e66d2f65b8e4042561b3.tar.xz linux-4dd163a0512eb91bbcf4e66d2f65b8e4042561b3.zip |
Merge branches 'tracing/ftrace', 'tracing/textedit' and 'linus' into tracing/core