Merge tag 'for-5.12/drivers-2021-02-17' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index c113989..abcf7e8 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1413,7 +1413,6 @@ F:        arch/arm*/include/asm/hw_breakpoint.h
 F:     arch/arm*/include/asm/perf_event.h
 F:     arch/arm*/kernel/hw_breakpoint.c
 F:     arch/arm*/kernel/perf_*
-F:     arch/arm/oprofile/common.c
 F:     drivers/perf/
 F:     include/linux/perf/arm_pmu.h
 
@@ -4060,7 +4059,6 @@ W:        http://www.ibm.com/developerworks/power/cell/
 F:     arch/powerpc/include/asm/cell*.h
 F:     arch/powerpc/include/asm/spu*.h
 F:     arch/powerpc/include/uapi/asm/spu*.h
-F:     arch/powerpc/oprofile/*cell*
 F:     arch/powerpc/platforms/cell/
 
 CELLWISE CW2015 BATTERY DRIVER
@@ -13291,15 +13289,6 @@ S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
 F:     sound/drivers/opl4/
 
-OPROFILE
-M:     Robert Richter <rric@kernel.org>
-L:     oprofile-list@lists.sf.net
-S:     Maintained
-F:     arch/*/include/asm/oprofile*.h
-F:     arch/*/oprofile/
-F:     drivers/oprofile/
-F:     include/linux/oprofile.h
-
 ORACLE CLUSTER FILESYSTEM 2 (OCFS2)
 M:     Mark Fasheh <mark@fasheh.com>
 M:     Joel Becker <jlbec@evilplan.org>
@@ -16919,12 +16908,6 @@ F:     include/linux/static_call*.h
 F:     kernel/jump_label.c
 F:     kernel/static_call.c
 
-STEC S1220 SKD DRIVER
-M:     Damien Le Moal <Damien.LeMoal@wdc.com>
-L:     linux-block@vger.kernel.org
-S:     Maintained
-F:     drivers/block/skd*[ch]
-
 STI AUDIO (ASoC) DRIVERS
 M:     Arnaud Pouliquen <arnaud.pouliquen@st.com>
 L:     alsa-devel@alsa-project.org (moderated for non-subscribers)