Merge branch 'perf/urgent' into perf/core, to pick up fixes

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index e9b0a4100a295d69c424e269b319d32b01443846..7ad4dac83d1a67fd75b4c12fd30dcfd9ce09f6d9 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -12769,6 +12769,13 @@ F:     arch/*/events/*
 F:     arch/*/events/*/*
 F:     tools/perf/
 
+PERFORMANCE EVENTS SUBSYSTEM ARM64 PMU EVENTS
+R:     John Garry <john.garry@huawei.com>
+R:     Will Deacon <will@kernel.org>
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:     Supported
+F:     tools/perf/pmu-events/arch/arm64/
+
 PERSONALITY HANDLING
 M:     Christoph Hellwig <hch@infradead.org>
 L:     linux-abi-devel@lists.sourceforge.net
@@ -16764,13 +16771,6 @@ W:     http://www.linux-usb.org/usbnet
 S:     Maintained
 F:     drivers/net/usb/dm9601.c
 
-USB DIAMOND RIO500 DRIVER
-M:     Cesar Miquel <miquel@df.uba.ar>
-L:     rio500-users@lists.sourceforge.net
-W:     http://rio500.sourceforge.net
-S:     Maintained
-F:     drivers/usb/misc/rio500*
-
 USB EHCI DRIVER
 M:     Alan Stern <stern@rowland.harvard.edu>
 L:     linux-usb@vger.kernel.org