tree da1ebe92d1a9f77a30248625e7b5208fef515168
parent fe6126722718e51fba4879517c11ac12d9775bcc
parent 75ec29ab848a7e92a41aaafaeb33d1afbc839be4
author Ingo Molnar <mingo@elte.hu> 1259136195 +0100
committer Ingo Molnar <mingo@elte.hu> 1259136195 +0100

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