On Fri, 16 Feb 2018 11:44:49 +0100 Boris Brezillon <boris.brezillon@xxxxxxxxxxx> wrote: > Free Electrons is now Bootlin. > > Signed-off-by: Boris Brezillon <boris.brezillon@xxxxxxxxxxx> > --- > Note that I'm planning to take this patch through the MTD tree. Applied to the nand/next branch of 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 <axel.lin@xxxxxxxxx> > Ben Gardner <bgardner@xxxxxxxxxx> > Ben M Cahill <ben.m.cahill@xxxxxxxxx> > Björn Steinbrink <B.Steinbrink@xxxxxx> > -Boris Brezillon <boris.brezillon@xxxxxxxxxxxxxxxxxx> > -Boris Brezillon <boris.brezillon@xxxxxxxxxxxxxxxxxx> <b.brezillon.dev@xxxxxxxxx> > -Boris Brezillon <boris.brezillon@xxxxxxxxxxxxxxxxxx> <b.brezillon@xxxxxxxxxxx> > +Boris Brezillon <boris.brezillon@xxxxxxxxxxx> > +Boris Brezillon <boris.brezillon@xxxxxxxxxxx> <boris.brezillon@xxxxxxxxxxxxxxxxxx> > +Boris Brezillon <boris.brezillon@xxxxxxxxxxx> <b.brezillon.dev@xxxxxxxxx> > +Boris Brezillon <boris.brezillon@xxxxxxxxxxx> <b.brezillon@xxxxxxxxxxx> > Brian Avery <b.avery@xxxxxx> > Brian King <brking@xxxxxxxxxx> > Christoph Hellwig <hch@xxxxxx> > 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 <boris.brezillon@xxxxxxxxxxxxxxxxxx> > +M: Boris Brezillon <boris.brezillon@xxxxxxxxxxx> > 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 <boris.brezillon@xxxxxxxxxxxxxxxxxx> > +M: Boris Brezillon <boris.brezillon@xxxxxxxxxxx> > L: dri-devel@xxxxxxxxxxxxxxxxxxxxx > 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 <boris.brezillon@xxxxxxxxxxxxxxxxxx> > +M: Boris Brezillon <boris.brezillon@xxxxxxxxxxx> > M: Arnaud Ebalard <arno@xxxxxxxxxxxx> > F: drivers/crypto/marvell/ > S: Maintained > @@ -9034,7 +9034,7 @@ F: mm/ > MEMORY TECHNOLOGY DEVICES (MTD) > M: David Woodhouse <dwmw2@xxxxxxxxxxxxx> > M: Brian Norris <computersforpeace@xxxxxxxxx> > -M: Boris Brezillon <boris.brezillon@xxxxxxxxxxxxxxxxxx> > +M: Boris Brezillon <boris.brezillon@xxxxxxxxxxx> > M: Marek Vasut <marek.vasut@xxxxxxxxx> > M: Richard Weinberger <richard@xxxxxx> > M: Cyrille Pitchen <cyrille.pitchen@xxxxxxxxxx> > @@ -9452,7 +9452,7 @@ S: Supported > F: drivers/net/ethernet/myricom/myri10ge/ > > NAND FLASH SUBSYSTEM > -M: Boris Brezillon <boris.brezillon@xxxxxxxxxxxxxxxxxx> > +M: Boris Brezillon <boris.brezillon@xxxxxxxxxxx> > R: Richard Weinberger <richard@xxxxxx> > L: linux-mtd@xxxxxxxxxxxxxxxxxxx > W: http://www.linux-mtd.infradead.org/ -- Boris Brezillon, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
