tree ec735b5133ddb0c46211c87a2a7ee66c71a6d433
parent 3daeb4da9a0b056bdc4af003e5605c1da4c0b068
parent 71e308a239c098673570d0b417d42262bb535909
author Ingo Molnar <mingo@elte.hu> 1245515208 +0200
committer Ingo Molnar <mingo@elte.hu> 1245515208 +0200

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