From 645be665a5932829239eea151c042dd5a6481e62 Mon Sep 17 00:00:00 2001 From: Miquel Raynal Date: Mon, 19 Feb 2018 23:57:59 +0100 Subject: MAINTAINERS: Update email address for Miquel Raynal Free Electrons is now Bootlin. Signed-off-by: Miquel Raynal Signed-off-by: Boris Brezillon --- .mailmap | 1 + 1 file changed, 1 insertion(+) (limited to '.mailmap') diff --git a/.mailmap b/.mailmap index e18cab73e209..6cc2d5a94cc2 100644 --- a/.mailmap +++ b/.mailmap @@ -126,6 +126,7 @@ Mayuresh Janorkar Michael Buesch Michel Dänzer Miodrag Dinic +Miquel Raynal Mitesh shah Mohit Kumar Morten Welinder -- cgit v1.2.3 From d8757f4c59c9fafe5a1ce75a237164f268904b18 Mon Sep 17 00:00:00 2001 From: Boris Brezillon Date: Fri, 16 Feb 2018 11:44:49 +0100 Subject: Update Boris Brezillon email address Free Electrons is now Bootlin. Signed-off-by: Boris Brezillon --- .mailmap | 6 +++--- MAINTAINERS | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to '.mailmap') diff --git a/.mailmap b/.mailmap index 6cc2d5a94cc2..85b28e8eb8ee 100644 --- a/.mailmap +++ b/.mailmap @@ -33,9 +33,9 @@ Axel Lin Ben Gardner Ben M Cahill Björn Steinbrink -Boris Brezillon -Boris Brezillon -Boris Brezillon +Boris Brezillon +Boris Brezillon +Boris Brezillon Brian Avery Brian King Christoph Hellwig diff --git a/MAINTAINERS b/MAINTAINERS index ab9c367f03c7..14890e5d3708 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 +M: Boris Brezillon 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 +M: Boris Brezillon L: dri-devel@lists.freedesktop.org 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 +M: Boris Brezillon M: Arnaud Ebalard F: drivers/crypto/marvell/ S: Maintained @@ -9034,7 +9034,7 @@ F: mm/ MEMORY TECHNOLOGY DEVICES (MTD) M: David Woodhouse M: Brian Norris -M: Boris Brezillon +M: Boris Brezillon M: Marek Vasut M: Richard Weinberger M: Cyrille Pitchen @@ -9452,7 +9452,7 @@ S: Supported F: drivers/net/ethernet/myricom/myri10ge/ NAND FLASH SUBSYSTEM -M: Boris Brezillon +M: Boris Brezillon R: Richard Weinberger L: linux-mtd@lists.infradead.org W: http://www.linux-mtd.infradead.org/ -- cgit v1.2.3