Free Electrons is now Bootlin. Signed-off-by: Miquel Raynal <miquel.ray...@bootlin.com> --- .mailmap | 1 + MAINTAINERS | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/.mailmap b/.mailmap index e18cab73e209..6cc2d5a94cc2 100644 --- a/.mailmap +++ b/.mailmap @@ -126,6 +126,7 @@ Mayuresh Janorkar <ma...@ti.com> Michael Buesch <m...@bues.ch> Michel Dänzer <mic...@tungstengraphics.com> Miodrag Dinic <miodrag.di...@mips.com> <miodrag.di...@imgtec.com> +Miquel Raynal <miquel.ray...@bootlin.com> <miquel.ray...@free-electrons.com> Mitesh shah <ms...@teja.com> Mohit Kumar <mohit.ku...@st.com> <mohit.kumar.dh...@gmail.com> Morten Welinder <te...@gnome.org> diff --git a/MAINTAINERS b/MAINTAINERS index 1efb94e6a8b3..1b0972015358 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8471,7 +8471,7 @@ S: Odd Fixes F: drivers/net/wireless/marvell/mwl8k.c MARVELL NAND CONTROLLER DRIVER -M: Miquel Raynal <miquel.ray...@free-electrons.com> +M: Miquel Raynal <miquel.ray...@bootlin.com> L: linux-...@lists.infradead.org S: Maintained F: drivers/mtd/nand/raw/marvell_nand.c -- 2.14.1
