tree ee15a5e7667b51d0d0f7e8cb39064652f7c84c28
parent 9de36825b321fe9fe9cf73260554251af579f4ca
parent 78ff7fae04554b49d29226ed12536268c2500d1f
author Ingo Molnar <mingo@elte.hu> 1236527331 +0100
committer Ingo Molnar <mingo@elte.hu> 1236527331 +0100

Merge branches 'tracing/doc', 'tracing/ftrace', 'tracing/printk' and 'tracing/textedit' into tracing/core