Merge branch 'perf/probes' into perf/core
authorIngo Molnar <mingo@elte.hu>
Thu, 3 Dec 2009 19:11:37 +0000 (20:11 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 3 Dec 2009 19:11:38 +0000 (20:11 +0100)
commitd103d01e4b19f185d3c85f77402b605534c32e89
treede78754f58524b49abf3103f2bc2e2be359eda2f
parent26fb20d008d841268545c25bb183f21ed16db891
parent6f5f67267dc4faecd9cba63894de92ca92a608b8
Merge branch 'perf/probes' into perf/core

Merge reason: add these fixes to 'perf probe'.

Signed-off-by: Ingo Molnar <mingo@elte.hu>