From: Laura Abbott <labbott@xxxxxxxxxx> Consolodate everything under an @kernel.org address. Signed-off-by: Laura Abbott <labbott@xxxxxxxxxx> --- Sumit, can you take this through your tree? --- .mailmap | 3 +++ MAINTAINERS | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap index 6277bb27b4bf..e7a5bb0c35ae 100644 --- a/.mailmap +++ b/.mailmap @@ -203,6 +203,9 @@ Koushik <raghavendra.koushik@xxxxxxxxxxxx> Krzysztof Kozlowski <krzk@xxxxxxxxxx> <k.kozlowski.k@xxxxxxxxx> Krzysztof Kozlowski <krzk@xxxxxxxxxx> <k.kozlowski@xxxxxxxxxxx> Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx> +Laura Abbott <labbott@xxxxxxxxxx> <lauraa@xxxxxxxxxxxxxx> +Laura Abbott <labbott@xxxxxxxxxx> <labbott@xxxxxxxxxx> +Laura Abbott <labobtt@xxxxxxxxxx> <laura@xxxxxxxxxxxx> Leonardo Bras <leobras.c@xxxxxxxxx> <leonardo@xxxxxxxxxxxxx> Leonid I Ananiev <leonid.i.ananiev@xxxxxxxxx> Leon Romanovsky <leon@xxxxxxxxxx> <leon@xxxxxxx> diff --git a/MAINTAINERS b/MAINTAINERS index 43007f2d29e0..21ab7c9d1bee 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5715,7 +5715,7 @@ DMA-BUF HEAPS FRAMEWORK M: Sumit Semwal <sumit.semwal@xxxxxxxxxx> R: Benjamin Gaignard <benjamin.gaignard@xxxxxxxxxx> R: Liam Mark <lmark@xxxxxxxxxxxxxx> -R: Laura Abbott <labbott@xxxxxxxxxx> +R: Laura Abbott <labbott@xxxxxxxxxx> R: Brian Starkey <Brian.Starkey@xxxxxxx> R: John Stultz <john.stultz@xxxxxxxxxx> L: linux-media@xxxxxxxxxxxxxxx -- 2.33.1
