tree 26a5cd89d950ce8900e2a36dd4ca3da0d7240641
parent acd895795d35d7c6405f20301a846d16998795ec
parent e3944bfac961cd7fc82f3b3143c55dc375748569
author Ingo Molnar <mingo@elte.hu> 1234342141 +0100
committer Ingo Molnar <mingo@elte.hu> 1234342141 +0100

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