diff options
author | Ingo Molnar <mingo@kernel.org> | 2012-07-18 09:18:00 (GMT) |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2012-07-18 09:18:00 (GMT) |
commit | 6e0f17be0361444862637e8986c8c1a3b3f8dcf8 (patch) | |
tree | 12322ecf05872d9c30c8cf3d77d4ed6961e87cd7 /arch/x86/include/asm/ftrace.h | |
parent | a2fe194723f6e4990d01d8c208c7b138fd410522 (diff) | |
parent | 93574fcc5b50cc7b8834698acb2ce947e5b6a5dc (diff) | |
download | linux-fsl-qoriq-6e0f17be0361444862637e8986c8c1a3b3f8dcf8.tar.xz |
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core
Pull tracing fix from Steve Rostedt.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/ftrace.h')
0 files changed, 0 insertions, 0 deletions