summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-04-26 12:24:28 +0100
committerMark Brown <broonie@kernel.org>2018-04-26 12:24:28 +0100
commitc0c0be9d12bb5983569f796954f4734734c0aaac (patch)
tree37bc91adec0eaa25c9257849d0ddfad278073519 /.mailmap
parente4b31b816c472ba5907b01a6f6a1626c1e8d51ef (diff)
parent572e6c8dd174bc6fc7ba5d9b6935e9ec8d2660f5 (diff)
downloadop-kernel-dev-c0c0be9d12bb5983569f796954f4734734c0aaac.zip
op-kernel-dev-c0c0be9d12bb5983569f796954f4734734c0aaac.tar.gz
Merge branch 'asoc-4.17' into asoc-4.18 for compress dependencies
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap3
1 files changed, 3 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 7fa9d41..29ddeb1 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>
OpenPOWER on IntegriCloud