summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorCatalin Marinas <catalin.marinas@arm.com>2019-02-15 18:27:23 +0000
committerCatalin Marinas <catalin.marinas@arm.com>2019-02-15 18:34:41 +0000
commit0543371a57e3f7562f1f271ac3bbce2ffd2add34 (patch)
tree21747e1260f05c3ccff40c5839db4150c98b4359 /MAINTAINERS
parenta80554fc36ba41d96af8e72fb54cd5d490e06c54 (diff)
parentcf2d65ec1d21f986bc128697aff5f52fef1ff12a (diff)
downloadlinux-0543371a57e3f7562f1f271ac3bbce2ffd2add34.tar.gz
linux-0543371a57e3f7562f1f271ac3bbce2ffd2add34.tar.bz2
linux-0543371a57e3f7562f1f271ac3bbce2ffd2add34.zip
Merge branch 'for-next/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux
* 'for-next/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux: perf: xgene: Remove set but not used variable 'config' arm64: perf: remove misleading comment dt-bindings: arm: Convert PMU binding to json-schema
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS2
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index f6a3b6c25494..e2383b1b5ad2 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1160,7 +1160,7 @@ F: arch/arm*/include/asm/hw_breakpoint.h
F: arch/arm*/include/asm/perf_event.h
F: drivers/perf/*
F: include/linux/perf/arm_pmu.h
-F: Documentation/devicetree/bindings/arm/pmu.txt
+F: Documentation/devicetree/bindings/arm/pmu.yaml
F: Documentation/devicetree/bindings/perf/
ARM PORT