tree b743ce0a3743d6f1b915b19b077a6d5bad980ea1
parent a1c611745c8c4e8996c1877d4e5d0fc95f227c38
parent c10076c4304083af15a41f6bc5e657e781c1f9a6
author Ingo Molnar <mingo@elte.hu> 1326790306 +0100
committer Ingo Molnar <mingo@elte.hu> 1326790306 +0100

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