diff options
| author | David S. Miller <davem@davemloft.net> | 2016-08-18 01:17:32 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-08-18 01:17:32 -0400 |
| commit | 60747ef4d173c2747bf7f0377fb22846cb422195 (patch) | |
| tree | ea0faf33b952495c47909be1400c475a3f3821b0 /.mailmap | |
| parent | 484334198f8ce9552e20930fff9408ebf6bcf94d (diff) | |
| parent | 184ca823481c99dadd7d946e5afd4bb921eab30d (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor overlapping changes for both merge conflicts.
Resolution work done by Stephen Rothwell was used
as a reference.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '.mailmap')
| -rw-r--r-- | .mailmap | 13 |
1 files changed, 11 insertions, 2 deletions
@@ -96,7 +96,13 @@ Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de> Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch> Mark Brown <broonie@sirena.org.uk> Matthieu CASTET <castet.matthieu@free.fr> -Mauro Carvalho Chehab <mchehab@kernel.org> <maurochehab@gmail.com> <mchehab@infradead.org> <mchehab@redhat.com> <m.chehab@samsung.com> <mchehab@osg.samsung.com> <mchehab@s-opensource.com> +Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@brturbo.com.br> +Mauro Carvalho Chehab <mchehab@kernel.org> <maurochehab@gmail.com> +Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@infradead.org> +Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@redhat.com> +Mauro Carvalho Chehab <mchehab@kernel.org> <m.chehab@samsung.com> +Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@osg.samsung.com> +Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@s-opensource.com> Matt Ranostay <mranostay@gmail.com> Matthew Ranostay <mranostay@embeddedalley.com> Matt Ranostay <mranostay@gmail.com> <matt.ranostay@intel.com> Mayuresh Janorkar <mayur@ti.com> @@ -132,7 +138,10 @@ Santosh Shilimkar <santosh.shilimkar@oracle.org> Sascha Hauer <s.hauer@pengutronix.de> S.Çağlar Onur <caglar@pardus.org.tr> Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com> -Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com> <shuah.khan@hp.com> <shuahkh@osg.samsung.com> <shuah.kh@samsung.com> +Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com> +Shuah Khan <shuah@kernel.org> <shuah.khan@hp.com> +Shuah Khan <shuah@kernel.org> <shuahkh@osg.samsung.com> +Shuah Khan <shuah@kernel.org> <shuah.kh@samsung.com> Simon Kelley <simon@thekelleys.org.uk> Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr> Stephen Hemminger <shemminger@osdl.org> |