summaryrefslogtreecommitdiffstats
path: root/include/linux/mtd
diff options
context:
space:
mode:
authorViresh Kumar2014-04-19 00:07:16 +0200
committerLinus Torvalds2014-04-19 01:40:08 +0200
commit9cc236827fde5e254fd995a0023c05c5ee3a3ba6 (patch)
treed33cc24f37a88b5d2217675276ffc06032f66bbd /include/linux/mtd
parentDocumentation/vm/numa_memory_policy.txt: fix wrong document in numa_memory_po... (diff)
downloadkernel-qcow2-linux-9cc236827fde5e254fd995a0023c05c5ee3a3ba6.tar.gz
kernel-qcow2-linux-9cc236827fde5e254fd995a0023c05c5ee3a3ba6.tar.xz
kernel-qcow2-linux-9cc236827fde5e254fd995a0023c05c5ee3a3ba6.zip
Shiraz has moved
shiraz.hashim@st.com email-id doesn't exist anymore as he has left the company. Replace ST's id with shiraz.linux.kernel@gmail.com. It also updates .mailmap file to fix address for 'git shortlog'. Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> Cc: Shiraz Hashim <shiraz.linux.kernel@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/mtd')
-rw-r--r--include/linux/mtd/spear_smi.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mtd/spear_smi.h b/include/linux/mtd/spear_smi.h
index 8ae1726044c3..581603ac1277 100644
--- a/include/linux/mtd/spear_smi.h
+++ b/include/linux/mtd/spear_smi.h
@@ -1,6 +1,6 @@
/*
* Copyright © 2010 ST Microelectronics
- * Shiraz Hashim <shiraz.hashim@st.com>
+ * Shiraz Hashim <shiraz.linux.kernel@gmail.com>
*
* This file is licensed under the terms of the GNU General Public
* License version 2. This program is licensed "as is" without any