bacf53a
parent b64909af1c1a441b31e8ffe812557a37103dd2d8
parent db4c75cbebd7e5910cd3bcb6790272fcc3042857
author Ingo Molnar <mingo@kernel.org> 1335350004 +0200
committer Ingo Molnar <mingo@kernel.org> 1335350004 +0200

Merge branch 'tip/perf/urgent-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/urgent