tree 9f80453153db272c207129d971e17d31a6bb214a
parent 64b9fb5704a479d98a59f2a1d45d3331a8f847f8
parent 7b60997f73865b019e595720185c85285ca3df9a
author Ingo Molnar <mingo@elte.hu> 1267172417 +0100
committer Ingo Molnar <mingo@elte.hu> 1267172417 +0100

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