aboutsummaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorShuah Khan <shuahkh@osg.samsung.com>2016-06-14 22:30:27 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2016-06-16 01:35:37 (GMT)
commit90effdcd2b8a39927aace655c72088a62911e8e1 (patch)
treeee5159c6d1fa0895427b93d1b459224cb1161797 /.mailmap
parent5dc8a864be0820677e7fce85d2832d4387c7bb88 (diff)
downloadkernel_replicant_linux-90effdcd2b8a39927aace655c72088a62911e8e1.zip
kernel_replicant_linux-90effdcd2b8a39927aace655c72088a62911e8e1.tar.gz
kernel_replicant_linux-90effdcd2b8a39927aace655c72088a62911e8e1.tar.bz2
Update email addresses in MAINTAINERS and .mailmap
Updating email addresses in MAINTAINERS and .mailmap files. Cc: stable@vger.kernel.org Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 4a293be..779a9ca 100644
--- a/.mailmap
+++ b/.mailmap
@@ -123,6 +123,7 @@ 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>
Simon Kelley <simon@thekelleys.org.uk>
Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
Stephen Hemminger <shemminger@osdl.org>