diff options
| author | Viresh Kumar <viresh.kumar@linaro.org> | 2014-04-18 18:07:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-18 19:40:08 -0400 |
| commit | 9cc236827fde5e254fd995a0023c05c5ee3a3ba6 (patch) | |
| tree | d33cc24f37a88b5d2217675276ffc06032f66bbd /.mailmap | |
| parent | 8f28ed92d9314b98dc2033df770f5e6b85c5ffb7 (diff) | |
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 '.mailmap')
| -rw-r--r-- | .mailmap | 1 |
1 files changed, 1 insertions, 0 deletions
| @@ -99,6 +99,7 @@ Sachin P Sant <ssant@in.ibm.com> | |||
| 99 | Sam Ravnborg <sam@mars.ravnborg.org> | 99 | Sam Ravnborg <sam@mars.ravnborg.org> |
| 100 | Sascha Hauer <s.hauer@pengutronix.de> | 100 | Sascha Hauer <s.hauer@pengutronix.de> |
| 101 | S.Çağlar Onur <caglar@pardus.org.tr> | 101 | S.Çağlar Onur <caglar@pardus.org.tr> |
| 102 | Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com> | ||
| 102 | Simon Kelley <simon@thekelleys.org.uk> | 103 | Simon Kelley <simon@thekelleys.org.uk> |
| 103 | Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr> | 104 | Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr> |
| 104 | Stephen Hemminger <shemminger@osdl.org> | 105 | Stephen Hemminger <shemminger@osdl.org> |