summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorMark Brown2018-04-26 13:24:28 +0200
committerMark Brown2018-04-26 13:24:28 +0200
commitc0c0be9d12bb5983569f796954f4734734c0aaac (patch)
tree37bc91adec0eaa25c9257849d0ddfad278073519 /.mailmap
parentASoC: mediatek: use snd_soc_dai_get_drvdata() to get the private data (diff)
parentASoC: compress: Only call free for components which have been opened (diff)
downloadkernel-qcow2-linux-c0c0be9d12bb5983569f796954f4734734c0aaac.tar.gz
kernel-qcow2-linux-c0c0be9d12bb5983569f796954f4734734c0aaac.tar.xz
kernel-qcow2-linux-c0c0be9d12bb5983569f796954f4734734c0aaac.zip
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 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>