summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-02-14 14:25:59 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-02-14 14:25:59 -0800
commit1b79dff672ca09a5461cc1d46ad81c62137841c5 (patch)
tree772a4224c78aa20862511ae5f7272f9311e4811c /.mailmap
parent83050a4e21979fe1821916fce2fca36255569ed3 (diff)
parent18558cae0272f8fd9647e69d3fec1565a7949865 (diff)
downloadlinux-1b79dff672ca09a5461cc1d46ad81c62137841c5.tar.bz2
Merge 4.5-rc4 into char-misc-next
We want those fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index b1e9a97653dc..7e6c5334c337 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>
+Antonio Ospite <ao2@ao2.it> <ao2@amarulasolutions.com>
Archit Taneja <archit@ti.com>
Arnaud Patard <arnaud.patard@rtp-net.org>
Arnd Bergmann <arnd@arndb.de>