tree ce074111ea317b6c9f0274c2aecd513ce78353a3
parent 788b94ba6c223d4ce955218d59075cd1edb92692
parent 021f5f12f2ab44874193c68fb19eea154493f83a
author Arnaldo Carvalho de Melo <acme@redhat.com> 1425307549 -0300
committer Arnaldo Carvalho de Melo <acme@redhat.com> 1425307549 -0300

Merge 'tip/perf/urgent' into perf/core to pick fixes

Needed to build perf/core buildable in some cases.

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