summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-06-05 14:27:30 +0300
committerMark Brown <broonie@kernel.org>2018-06-05 14:27:30 +0300
commit2858e2cfc2ef6501bc9a8cccf847a4ee58b5c9bf (patch)
tree2c8387e353d06a3510c8d160eff2ebcacb00e12c /.mailmap
parent29dcea88779c856c7dc92040a0c01233263101d4 (diff)
parentc90ddb69d4b24bc32edf9c7bcfec85e52427d1c1 (diff)
downloadlinux-2858e2cfc2ef6501bc9a8cccf847a4ee58b5c9bf.tar.xz
Merge branch 'asoc-4.17' into asoc-linus
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap3
1 files changed, 3 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 7fa9d41fbdaf..29ddeb1bf015 100644
--- a/.mailmap
+++ b/.mailmap
@@ -186,6 +186,9 @@ Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
Uwe Kleine-König <ukl@pengutronix.de>
Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
+Vinod Koul <vkoul@kernel.org> <vinod.koul@intel.com>
+Vinod Koul <vkoul@kernel.org> <vinod.koul@linux.intel.com>
+Vinod Koul <vkoul@kernel.org> <vkoul@infradead.org>
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>