]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'tip/perf/core-2' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...
authorIngo Molnar <mingo@kernel.org>
Tue, 13 Nov 2012 18:21:32 +0000 (19:21 +0100)
committerIngo Molnar <mingo@kernel.org>
Tue, 13 Nov 2012 18:21:32 +0000 (19:21 +0100)
Pull tracing updates from Steven Rostedt.

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

Trivial merge