Merge remote-tracking branch 'tip/perf/urgent' into perf/core
authorArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 19 Jun 2017 18:14:35 +0000 (15:14 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 19 Jun 2017 18:14:35 +0000 (15:14 -0300)
Merge branch 'perf/urgent' into perf/core, to pick up fixes

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

Trivial merge