tree 8bf3ba7b3395490441722360d2872480f64cd694
parent cc0104e877fff32865a67b256d3a9ce52ff15790
parent cc51a0fca66658ea710db566ba17e80e3f7d4957
author Ingo Molnar <mingo@elte.hu> 1260807157 +0100
committer Ingo Molnar <mingo@elte.hu> 1260807157 +0100

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