tree 2169cbd29d5d9a4cbc7104b2a744a95ba746c50d
parent 5d67be97f8903d05ce53597fb5f3bc25a45e8026
parent 1fd8df2c3970c9e7e4e262354154ee39e58bdd7c
author Ingo Molnar <mingo@elte.hu> 1309859743 +0200
committer Ingo Molnar <mingo@elte.hu> 1309859743 +0200

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