From: Catalin Marinas <catalin.marinas@arm.com>
Date: Wed, 27 Jun 2018 15:01:05 +0000 (+0100)
Subject: Merge branch 'perf/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux
X-Git-Tag: v4.18-rc3~15^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7838306f5ace5183086ad507c58f5988913690e4;p=thirdparty%2Flinux.git

Merge branch 'perf/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux

* 'perf/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux:
  drivers/perf: xgene_pmu: Fix IOB SLOW PMU parser error
---

7838306f5ace5183086ad507c58f5988913690e4