diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-03 08:30:41 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-03 08:30:41 +1100 |
| commit | b8ac71b6d039996880b5505c333ffef3027a04d0 (patch) | |
| tree | 989d7a439e65491f4d49fb4190390966fbf6ba21 /MAINTAINERS | |
| parent | 61b10daa36d0aa8adebe007c628b6adc9ac8da2f (diff) | |
| parent | 26eb4aa9a48a27b606e032948f1061d577589e92 (diff) | |
Merge remote-tracking branch 'mips/mips-for-linux-next'
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 5736b4055b1c..a55feaaa898d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7718,6 +7718,12 @@ W: http://www.kernel.org/doc/man-pages L: linux-man@vger.kernel.org S: Maintained +MARDUK (CREATOR CI40) DEVICE TREE SUPPORT +M: Rahul Bedarkar <rahul.bedarkar@imgtec.com> +L: linux-mips@linux-mips.org +S: Maintained +F: arch/mips/boot/dts/img/pistachio_marduk.dts + MARVELL 88E6XXX ETHERNET SWITCH FABRIC DRIVER M: Andrew Lunn <andrew@lunn.ch> M: Vivien Didelot <vivien.didelot@savoirfairelinux.com> @@ -9819,7 +9825,7 @@ L: linux-mips@linux-mips.org S: Maintained F: arch/mips/pistachio/ F: arch/mips/include/asm/mach-pistachio/ -F: arch/mips/boot/dts/pistachio/ +F: arch/mips/boot/dts/img/pistachio* F: arch/mips/configs/pistachio*_defconfig PKTCDVD DRIVER |