summaryrefslogtreecommitdiffstatshomepage
path: root/.mailmap
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-04-26 03:24:28 -0800
committerMark Brown <broonie@kernel.org>2018-04-26 03:24:28 -0800
commitc0c0be9d12bb5983569f796954f4734734c0aaac (patch)
tree37bc91adec0eaa25c9257849d0ddfad278073519 /.mailmap
parente4b31b816c472ba5907b01a6f6a1626c1e8d51ef (diff)
parent572e6c8dd174bc6fc7ba5d9b6935e9ec8d2660f5 (diff)
downloadlinux-stable-c0c0be9d12bb5983569f796954f4734734c0aaac.tar.gz
linux-stable-c0c0be9d12bb5983569f796954f4734734c0aaac.tar.bz2
linux-stable-c0c0be9d12bb5983569f796954f4734734c0aaac.tar.xz
linux-stable-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>
186Uwe Kleine-König <ukl@pengutronix.de> 186Uwe Kleine-König <ukl@pengutronix.de>
187Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com> 187Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
188Valdis Kletnieks <Valdis.Kletnieks@vt.edu> 188Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
189Vinod Koul <vkoul@kernel.org> <vinod.koul@intel.com>
190Vinod Koul <vkoul@kernel.org> <vinod.koul@linux.intel.com>
191Vinod Koul <vkoul@kernel.org> <vkoul@infradead.org>
189Viresh Kumar <vireshk@kernel.org> <viresh.kumar@st.com> 192Viresh Kumar <vireshk@kernel.org> <viresh.kumar@st.com>
190Viresh Kumar <vireshk@kernel.org> <viresh.linux@gmail.com> 193Viresh Kumar <vireshk@kernel.org> <viresh.linux@gmail.com>
191Viresh Kumar <vireshk@kernel.org> <viresh.kumar2@arm.com> 194Viresh Kumar <vireshk@kernel.org> <viresh.kumar2@arm.com>