diff options
| -rw-r--r-- | .mailmap | 3 | ||||
| -rw-r--r-- | MAINTAINERS | 10 |
2 files changed, 8 insertions, 5 deletions
@@ -184,6 +184,9 @@ Christian Brauner <brauner@kernel.org> <christian@brauner.io> Christian Brauner <brauner@kernel.org> <christian.brauner@canonical.com> Christian Brauner <brauner@kernel.org> <christian.brauner@ubuntu.com> Christian Marangi <ansuelsmth@gmail.com> +Christophe Leroy <chleroy@kernel.org> <christophe.leroy@c-s.fr> +Christophe Leroy <chleroy@kernel.org> <christophe.leroy@csgroup.eu> +Christophe Leroy <chleroy@kernel.org> <christophe.leroy2@cs-soprasteria.com> Christophe Ricard <christophe.ricard@gmail.com> Christopher Obbard <christopher.obbard@linaro.org> <chris.obbard@collabora.com> Christoph Hellwig <hch@lst.de> diff --git a/MAINTAINERS b/MAINTAINERS index 46126ce2f968..c338baa3af99 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4532,7 +4532,7 @@ F: drivers/net/ethernet/netronome/nfp/bpf/ BPF JIT for POWERPC (32-BIT AND 64-BIT) M: Hari Bathini <hbathini@linux.ibm.com> -M: Christophe Leroy <christophe.leroy@csgroup.eu> +M: Christophe Leroy (CS GROUP) <chleroy@kernel.org> R: Naveen N Rao <naveen@kernel.org> L: bpf@vger.kernel.org S: Supported @@ -10003,7 +10003,7 @@ F: drivers/spi/spi-fsl-qspi.c FREESCALE QUICC ENGINE LIBRARY M: Qiang Zhao <qiang.zhao@nxp.com> -M: Christophe Leroy <christophe.leroy@csgroup.eu> +M: Christophe Leroy (CS GROUP) <chleroy@kernel.org> L: linuxppc-dev@lists.ozlabs.org S: Maintained F: drivers/soc/fsl/qe/ @@ -10056,7 +10056,7 @@ S: Maintained F: drivers/tty/serial/ucc_uart.c FREESCALE SOC DRIVERS -M: Christophe Leroy <christophe.leroy@csgroup.eu> +M: Christophe Leroy (CS GROUP) <chleroy@kernel.org> L: linuxppc-dev@lists.ozlabs.org L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained @@ -14296,7 +14296,7 @@ LINUX FOR POWERPC (32-BIT AND 64-BIT) M: Madhavan Srinivasan <maddy@linux.ibm.com> M: Michael Ellerman <mpe@ellerman.id.au> R: Nicholas Piggin <npiggin@gmail.com> -R: Christophe Leroy <christophe.leroy@csgroup.eu> +R: Christophe Leroy (CS GROUP) <chleroy@kernel.org> L: linuxppc-dev@lists.ozlabs.org S: Supported W: https://github.com/linuxppc/wiki/wiki @@ -14352,7 +14352,7 @@ F: Documentation/devicetree/bindings/powerpc/fsl/ F: arch/powerpc/platforms/85xx/ LINUX FOR POWERPC EMBEDDED PPC8XX AND PPC83XX -M: Christophe Leroy <christophe.leroy@csgroup.eu> +M: Christophe Leroy (CS GROUP) <chleroy@kernel.org> L: linuxppc-dev@lists.ozlabs.org S: Maintained F: arch/powerpc/platforms/8xx/ |