tree 4bbaa58f826152212ad8394be8442112b4aac04b
parent cb04ff9ac424d0e689d9b612e9f73cb443ab4b7e
parent 68179686ac67cb08f08b1ef28b860d5ed899f242
author Ingo Molnar <mingo@kernel.org> 1336584870 +0200
committer Ingo Molnar <mingo@kernel.org> 1336584870 +0200

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