diff options
| -rw-r--r-- | .mailmap | 1 | ||||
| -rw-r--r-- | MAINTAINERS | 12 |
2 files changed, 7 insertions, 6 deletions
@@ -200,6 +200,7 @@ Li Yang <leoyang.li@nxp.com> <leoli@freescale.com> Li Yang <leoyang.li@nxp.com> <leo@zh-kernel.org> Lukasz Luba <lukasz.luba@arm.com> <l.luba@partner.samsung.com> Maciej W. Rozycki <macro@mips.com> <macro@imgtec.com> +Maciej W. Rozycki <macro@orcam.me.uk> <macro@linux-mips.org> Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com> Marc Zyngier <maz@kernel.org> <marc.zyngier@arm.com> Mark Brown <broonie@sirena.org.uk> diff --git a/MAINTAINERS b/MAINTAINERS index 546aa66428c9..6add29cb2060 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4939,7 +4939,7 @@ F: Documentation/networking/decnet.rst F: net/decnet/ DECSTATION PLATFORM SUPPORT -M: "Maciej W. Rozycki" <macro@linux-mips.org> +M: "Maciej W. Rozycki" <macro@orcam.me.uk> L: linux-mips@vger.kernel.org S: Maintained W: http://www.linux-mips.org/wiki/DECstation @@ -4948,12 +4948,12 @@ F: arch/mips/include/asm/dec/ F: arch/mips/include/asm/mach-dec/ DEFXX FDDI NETWORK DRIVER -M: "Maciej W. Rozycki" <macro@linux-mips.org> +M: "Maciej W. Rozycki" <macro@orcam.me.uk> S: Maintained F: drivers/net/fddi/defxx.* DEFZA FDDI NETWORK DRIVER -M: "Maciej W. Rozycki" <macro@linux-mips.org> +M: "Maciej W. Rozycki" <macro@orcam.me.uk> S: Maintained F: drivers/net/fddi/defza.* @@ -6224,7 +6224,7 @@ F: include/linux/dim.h F: lib/dim/ DZ DECSTATION DZ11 SERIAL DRIVER -M: "Maciej W. Rozycki" <macro@linux-mips.org> +M: "Maciej W. Rozycki" <macro@orcam.me.uk> S: Maintained F: drivers/tty/serial/dz.* @@ -18091,7 +18091,7 @@ F: Documentation/networking/tuntap.rst F: arch/um/os-Linux/drivers/ TURBOCHANNEL SUBSYSTEM -M: "Maciej W. Rozycki" <macro@linux-mips.org> +M: "Maciej W. Rozycki" <macro@orcam.me.uk> M: Ralf Baechle <ralf@linux-mips.org> L: linux-mips@vger.kernel.org S: Maintained @@ -19725,7 +19725,7 @@ F: Documentation/admin-guide/blockdev/zram.rst F: drivers/block/zram/ ZS DECSTATION Z85C30 SERIAL DRIVER -M: "Maciej W. Rozycki" <macro@linux-mips.org> +M: "Maciej W. Rozycki" <macro@orcam.me.uk> S: Maintained F: drivers/tty/serial/zs.* |