diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-17 08:27:51 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-17 08:27:51 +1100 |
| commit | 20dcca984b4128dd0176ef01f866f5e56a104b48 (patch) | |
| tree | dc602833e5cefdf8d98f9d167c763b1bd63ffb81 /MAINTAINERS | |
| parent | e9155069b6f5db828b40697e44c5c82394dd131a (diff) | |
| parent | dd5b674a1b96ed0d25e3a0d6fa644b9627285bf6 (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 e37111bc7eb5..f8cab50a55b9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7724,6 +7724,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> @@ -9825,7 +9831,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 |