Free Electrons is now Bootlin. Signed-off-by: Boris Brezillon <[email protected]> --- Note that I'm planning to take this patch through the MTD tree. --- .mailmap | 7 ++++--- MAINTAINERS | 10 +++++----- 2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/.mailmap b/.mailmap index e18cab73e209..50c1d6bf36b2 100644 --- a/.mailmap +++ b/.mailmap @@ -33,9 +33,10 @@ Axel Lin <[email protected]> Ben Gardner <[email protected]> Ben M Cahill <[email protected]> Björn Steinbrink <[email protected]> -Boris Brezillon <[email protected]> -Boris Brezillon <[email protected]> <[email protected]> -Boris Brezillon <[email protected]> <[email protected]> +Boris Brezillon <[email protected]> +Boris Brezillon <[email protected]> <[email protected]> +Boris Brezillon <[email protected]> <[email protected]> +Boris Brezillon <[email protected]> <[email protected]> Brian Avery <[email protected]> Brian King <[email protected]> Christoph Hellwig <[email protected]> diff --git a/MAINTAINERS b/MAINTAINERS index 34b2e9ed6d3d..38fcbabbc55b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1232,7 +1232,7 @@ F: arch/arm/boot/dts/aspeed-* F: drivers/*/*aspeed* ARM/ATMEL AT91 Clock Support -M: Boris Brezillon <[email protected]> +M: Boris Brezillon <[email protected]> S: Maintained F: drivers/clk/at91 @@ -4644,7 +4644,7 @@ F: Documentation/gpu/meson.rst T: git git://anongit.freedesktop.org/drm/drm-misc DRM DRIVERS FOR ATMEL HLCDC -M: Boris Brezillon <[email protected]> +M: Boris Brezillon <[email protected]> L: [email protected] S: Supported F: drivers/gpu/drm/atmel-hlcdc/ @@ -8412,7 +8412,7 @@ F: include/uapi/drm/armada_drm.h F: Documentation/devicetree/bindings/display/armada/ MARVELL CRYPTO DRIVER -M: Boris Brezillon <[email protected]> +M: Boris Brezillon <[email protected]> M: Arnaud Ebalard <[email protected]> F: drivers/crypto/marvell/ S: Maintained @@ -9034,7 +9034,7 @@ F: mm/ MEMORY TECHNOLOGY DEVICES (MTD) M: David Woodhouse <[email protected]> M: Brian Norris <[email protected]> -M: Boris Brezillon <[email protected]> +M: Boris Brezillon <[email protected]> M: Marek Vasut <[email protected]> M: Richard Weinberger <[email protected]> M: Cyrille Pitchen <[email protected]> @@ -9452,7 +9452,7 @@ S: Supported F: drivers/net/ethernet/myricom/myri10ge/ NAND FLASH SUBSYSTEM -M: Boris Brezillon <[email protected]> +M: Boris Brezillon <[email protected]> R: Richard Weinberger <[email protected]> L: [email protected] W: http://www.linux-mtd.infradead.org/ -- 2.14.1
