tree bfe6ec2eb550927a37c56926825b837d9eea1fcf
parent 292eaf50c7df4ae2ae8aaa9e1ce3f1240a353ee8
author Joe Perches <joe@perches.com> 1470287803 -0700
committer Mauro Carvalho Chehab <mchehab@s-opensource.com> 1470357341 -0300

.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>