diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-11-08 09:34:35 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-11-08 09:34:35 +0100 |
commit | a6b0786f7f83bcc4d414a2977aaebe2941ebe1de (patch) | |
tree | fd7cbdda3de7eaf05eaa01eb3609121cc05828d8 /arch/x86/mm/Makefile | |
parent | ring-buffer: convert to raw spinlocks (diff) | |
parent | ftrace: split out hardirq ftrace code into own header (diff) | |
parent | ftrace: fix breakage in bin_fmt results (diff) | |
download | linux-a6b0786f7f83bcc4d414a2977aaebe2941ebe1de.tar.xz linux-a6b0786f7f83bcc4d414a2977aaebe2941ebe1de.zip |
Merge branches 'tracing/ftrace', 'tracing/fastboot', 'tracing/nmisafe' and 'tracing/urgent' into tracing/core