Merge tag 'mips_5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux

[linux-2.6-microblaze.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 92d10ac..59ff351 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -11120,7 +11120,7 @@ MARDUK (CREATOR CI40) DEVICE TREE SUPPORT
 M:     Rahul Bedarkar <rahulbedarkar89@gmail.com>
 L:     linux-mips@vger.kernel.org
 S:     Maintained
-F:     arch/mips/boot/dts/img/pistachio_marduk.dts
+F:     arch/mips/boot/dts/img/pistachio*
 
 MARVELL 88E6XXX ETHERNET SWITCH FABRIC DRIVER
 M:     Andrew Lunn <andrew@lunn.ch>
@@ -14824,14 +14824,6 @@ S:     Maintained
 W:     http://www.st.com/spear
 F:     drivers/pinctrl/spear/
 
-PISTACHIO SOC SUPPORT
-M:     James Hartley <james.hartley@sondrel.com>
-L:     linux-mips@vger.kernel.org
-S:     Odd Fixes
-F:     arch/mips/boot/dts/img/pistachio*
-F:     arch/mips/configs/pistachio*_defconfig
-F:     arch/mips/pistachio/
-
 PKTCDVD DRIVER
 M:     linux-block@vger.kernel.org
 S:     Orphan