tree 177871323b183610017c65c68f0bde9af2f37f47
parent 9521d830b6341d1887dcfc2aebde23fbfa5f1473
parent 89c5bd08df5841326abbf167d136bcf14cf759ed
author Arnaldo Carvalho de Melo <acme@redhat.com> 1332439748 -0300
committer Arnaldo Carvalho de Melo <acme@redhat.com> 1332439748 -0300

Merge branch 'perf/urgent' into perf/core

Merge Reason: to pick the fix:

 commit e7f01d1
     perf tools: Use scnprintf where applicable

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>