[PATCH 1/2] mailmap: Antoine Tenart's email

[PATCH 1/2] mailmap: Antoine Tenart's email

[Antoine Tenart]

I used "Antoine Ténart" at first but then moved to a name without accent
as this cause some issues from time to time... Add my email in the
mailmap file to have a consistent shortlog output.

Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index 08b80428f583..8fe808647142 100644
--- a/.mailmap
+++ b/.mailmap
@@ -21,6 +21,7 @@ Andrey Ryabinin <ryabinin.a.a@gmail.com> <a.ryabinin@samsung.com>
 Andrew Morton <akpm@linux-foundation.org>
 Andrew Vasquez <andrew.vasquez@qlogic.com>
 Andy Adamson <andros@citi.umich.edu>
+Antoine Tenart <antoine.tenart@free-electrons.com>
 Antonio Ospite <ao2@ao2.it> <ao2@amarulasolutions.com>
 Archit Taneja <archit@ti.com>
 Arnaud Patard <arnaud.patard@rtp-net.org>
-- 
2.8.4

[PATCH 2/2] mailmap: Boris Brezillon's email

[Antoine Tenart]

There are different versions of Boris' name and email in the log, and
one typo.  Add his emails in mailmap to have all of his contributions
under the same name/email tuple.

Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Cc: Boris Brezillon <boris.brezillon@free-electrons.com>
---
 .mailmap | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.mailmap b/.mailmap
index 8fe808647142..d2f514804721 100644
--- a/.mailmap
+++ b/.mailmap
@@ -31,6 +31,9 @@ Axel Lin <axel.lin@gmail.com>
 Ben Gardner <bgardner@wabtec.com>
 Ben M Cahill <ben.m.cahill@intel.com>
 Björn Steinbrink <B.Steinbrink@gmx.de>
+Boris Brezillon <boris.brezillon@free-electrons.com>
+Boris Brezillon <boris.brezillon@free-electrons.com> <b.brezillon.dev@gmail.com>
+Boris Brezillon <boris.brezillon@free-electrons.com> <b.brezillon@overkiz.com>
 Brian Avery <b.avery@hp.com>
 Brian King <brking@us.ibm.com>
 Christoph Hellwig <hch@lst.de>
-- 
2.8.4

Re: [PATCH 2/2] mailmap: Boris Brezillon's email

[Boris Brezillon]

On Thu,  9 Jun 2016 15:03:23 +0200
Antoine Tenart <antoine.tenart@free-electrons.com> wrote:

> There are different versions of Boris' name and email in the log, and
> one typo.  Add his emails in mailmap to have all of his contributions
> under the same name/email tuple.
> 
> Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
> Cc: Boris Brezillon <boris.brezillon@free-electrons.com>

Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>

Thanks,

Boris

> ---
>  .mailmap | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/.mailmap b/.mailmap
> index 8fe808647142..d2f514804721 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -31,6 +31,9 @@ Axel Lin <axel.lin@gmail.com>
>  Ben Gardner <bgardner@wabtec.com>
>  Ben M Cahill <ben.m.cahill@intel.com>
>  Björn Steinbrink <B.Steinbrink@gmx.de>
> +Boris Brezillon <boris.brezillon@free-electrons.com>
> +Boris Brezillon <boris.brezillon@free-electrons.com> <b.brezillon.dev@gmail.com>
> +Boris Brezillon <boris.brezillon@free-electrons.com> <b.brezillon@overkiz.com>
>  Brian Avery <b.avery@hp.com>
>  Brian King <brking@us.ibm.com>
>  Christoph Hellwig <hch@lst.de>



-- 
Boris Brezillon, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com