Shiraz has moved

[email protected] email-id doesn't exist anymore as he has left the
company.  Replace ST's id with [email protected].

It also updates .mailmap file to fix address for 'git shortlog'.

Signed-off-by: Viresh Kumar <[email protected]>
Cc: Shiraz Hashim <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
diff --git a/MAINTAINERS b/MAINTAINERS
index 80399ff..e67ea24 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8315,7 +8315,7 @@
 
 SPEAR PLATFORM SUPPORT
 M:	Viresh Kumar <[email protected]>
-M:	Shiraz Hashim <[email protected]>
+M:	Shiraz Hashim <[email protected]>
 L:	[email protected]
 L:	[email protected] (moderated for non-subscribers)
 W:	http://www.st.com/spear