tree a56d9e11f23e3433f9eaa5b3f9dec7bef378c37e
parent 1fa2e84db3f95adab8d9c2aa245e9a0ebf32248a
parent 59a094c994a138049b41a44bc29cff9407d51c5b
author Ingo Molnar <mingo@kernel.org> 1336381432 +0200
committer Ingo Molnar <mingo@kernel.org> 1336381432 +0200

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