tree 8fb9fd14131194174c12daf5d8195afd3b62bc3e
parent 745b1626dd71ce9661a05ea4db57859ed5c773d2
parent 1de9e8e70f5acc441550ca75433563d91b269bbe
author Ingo Molnar <mingo@elte.hu> 1232306105 +0100
committer Ingo Molnar <mingo@elte.hu> 1232306105 +0100

Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc2' into tracing/core