tree 702dd6a7ce06d224d594c2293af546b11ac9f51b
parent 6329d3021bcfa9038621e6e917d98929421d8ec8
parent 98a05ed4bd7774f533ab185fe0bf2fdc58292d7c
author Ingo Molnar <mingo@elte.hu> 1215682980 +0200
committer Ingo Molnar <mingo@elte.hu> 1215682980 +0200

Merge branch 'tracing/ftrace' into auto-ftrace-next