tree 610700282791b0469bbf09921993857e0b0b51fe
parent 983f2163e7fdf11a15e05816de243f93f07eafca
parent b36461da2a0389149d7f88f3cbc05a30d1db9faa
author Ingo Molnar <mingo@elte.hu> 1253128597 +0200
committer Ingo Molnar <mingo@elte.hu> 1253128597 +0200

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