Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64...
[linux-2.6-block.git] / MAINTAINERS
index 15dbcdc7bb256ad0ae4b8410d3650e66b871cd95..b5bffd2d7f8c66968c996e3ade3fa8930aa3cb56 100644 (file)
@@ -366,6 +366,7 @@ M:  Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
 M:     Hanjun Guo <hanjun.guo@linaro.org>
 M:     Sudeep Holla <sudeep.holla@arm.com>
 L:     linux-acpi@vger.kernel.org
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     drivers/acpi/arm64
 
@@ -1195,7 +1196,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