summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-09-05 08:11:21 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-09-05 08:11:21 +0200
commitb53761e36a509609e91a797fa63648ec43aecc13 (patch)
tree4bbb955440c7eeac562a2abc6046c60255943cbb /.mailmap
parentd2f5a7311bcaed681a41cb3419b8fe92a7b68bf5 (diff)
parentc6935931c1894ff857616ff8549b61236a19148f (diff)
downloadop-kernel-dev-b53761e36a509609e91a797fa63648ec43aecc13.zip
op-kernel-dev-b53761e36a509609e91a797fa63648ec43aecc13.tar.gz
Merge 4.8-rc5 into tty-next
We want the fixes in here for merge issues. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap2
1 files changed, 2 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 2a91c14..093a8ac 100644
--- a/.mailmap
+++ b/.mailmap
@@ -158,6 +158,8 @@ Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
Viresh Kumar <vireshk@kernel.org> <viresh.kumar@st.com>
Viresh Kumar <vireshk@kernel.org> <viresh.linux@gmail.com>
Viresh Kumar <vireshk@kernel.org> <viresh.kumar2@arm.com>
+Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com>
+Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>
Takashi YOSHII <takashi.yoshii.zj@renesas.com>
Yusuke Goda <goda.yusuke@renesas.com>
Gustavo Padovan <gustavo@las.ic.unicamp.br>
OpenPOWER on IntegriCloud