diff options
| author | Joe Perches <joe@perches.com> | 2016-08-04 01:16:43 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2016-08-04 20:35:41 -0400 |
| commit | 5055610e3d30ed90de77525cf240d0066ac616e4 (patch) | |
| tree | bfe6ec2eb550927a37c56926825b837d9eea1fcf /.mailmap | |
| parent | 292eaf50c7df4ae2ae8aaa9e1ce3f1240a353ee8 (diff) | |
.mailmap: Correct entries for Mauro Carvalho Chehab and Shuah Khan
mailmap entries may not use more than 2 email addresses per line.
Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Shuah Khan <shuahkh@osg.samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to '.mailmap')
| -rw-r--r-- | .mailmap | 13 |
1 files changed, 11 insertions, 2 deletions
| @@ -94,7 +94,13 @@ Leonid I Ananiev <leonid.i.ananiev@intel.com> | |||
| 94 | Linas Vepstas <linas@austin.ibm.com> | 94 | Linas Vepstas <linas@austin.ibm.com> |
| 95 | Mark Brown <broonie@sirena.org.uk> | 95 | Mark Brown <broonie@sirena.org.uk> |
| 96 | Matthieu CASTET <castet.matthieu@free.fr> | 96 | Matthieu CASTET <castet.matthieu@free.fr> |
| 97 | 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> | 97 | Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@brturbo.com.br> |
| 98 | Mauro Carvalho Chehab <mchehab@kernel.org> <maurochehab@gmail.com> | ||
| 99 | Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@infradead.org> | ||
| 100 | Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@redhat.com> | ||
| 101 | Mauro Carvalho Chehab <mchehab@kernel.org> <m.chehab@samsung.com> | ||
| 102 | Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@osg.samsung.com> | ||
| 103 | Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@s-opensource.com> | ||
| 98 | Matt Ranostay <mranostay@gmail.com> Matthew Ranostay <mranostay@embeddedalley.com> | 104 | Matt Ranostay <mranostay@gmail.com> Matthew Ranostay <mranostay@embeddedalley.com> |
| 99 | Matt Ranostay <mranostay@gmail.com> <matt.ranostay@intel.com> | 105 | Matt Ranostay <mranostay@gmail.com> <matt.ranostay@intel.com> |
| 100 | Mayuresh Janorkar <mayur@ti.com> | 106 | Mayuresh Janorkar <mayur@ti.com> |
| @@ -130,7 +136,10 @@ Santosh Shilimkar <santosh.shilimkar@oracle.org> | |||
| 130 | Sascha Hauer <s.hauer@pengutronix.de> | 136 | Sascha Hauer <s.hauer@pengutronix.de> |
| 131 | S.Çağlar Onur <caglar@pardus.org.tr> | 137 | S.Çağlar Onur <caglar@pardus.org.tr> |
| 132 | Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com> | 138 | Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com> |
| 133 | Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com> <shuah.khan@hp.com> <shuahkh@osg.samsung.com> <shuah.kh@samsung.com> | 139 | Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com> |
| 140 | Shuah Khan <shuah@kernel.org> <shuah.khan@hp.com> | ||
| 141 | Shuah Khan <shuah@kernel.org> <shuahkh@osg.samsung.com> | ||
| 142 | Shuah Khan <shuah@kernel.org> <shuah.kh@samsung.com> | ||
| 134 | Simon Kelley <simon@thekelleys.org.uk> | 143 | Simon Kelley <simon@thekelleys.org.uk> |
| 135 | Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr> | 144 | Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr> |
| 136 | Stephen Hemminger <shemminger@osdl.org> | 145 | Stephen Hemminger <shemminger@osdl.org> |