tree f646e5246679ca851baf54e888c0d59b66ecf324
parent 1ebdfa803dc5ced604ebadd26fcb8cdca8e09b85
parent 3d56e331b6537671c66f1b510bed0f1e0331dfc8
author Ingo Molnar <mingo@elte.hu> 1296842573 +0100
committer Ingo Molnar <mingo@elte.hu> 1296842573 +0100

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