]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'tip/perf/core-2' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...
authorIngo Molnar <mingo@kernel.org>
Tue, 21 Aug 2012 09:36:39 +0000 (11:36 +0200)
committerIngo Molnar <mingo@kernel.org>
Tue, 21 Aug 2012 09:36:49 +0000 (11:36 +0200)
commit2171d5e693ab652f096d688c20c8a830115b572f
tree585f685aacda161cb00bb0c8599e4f60b3c262c6
parent4c647745e9c5b582106f7898efbebe0da61f7c84
parent2fa550b7006b2312a3f2072695000d48b581600d
Merge branch 'tip/perf/core-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core

Pull ftrace fixlets from Steve Rostedt.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
kernel/trace/trace.c