Merge branch 'perf/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux
authorCatalin Marinas <catalin.marinas@arm.com>
Wed, 27 Jun 2018 15:01:05 +0000 (16:01 +0100)
committerCatalin Marinas <catalin.marinas@arm.com>
Wed, 27 Jun 2018 15:01:05 +0000 (16:01 +0100)
* 'perf/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux:
  drivers/perf: xgene_pmu: Fix IOB SLOW PMU parser error


Trivial merge