Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

This project is archived. Its data is read-only.

Commit 9cc23682 authored Apr 18, 2014 by Viresh Kumar Committed by Linus Torvalds Apr 18, 2014

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>

parent 8f28ed92

.mailmap

+1 −0

Original line number	Diff line number	Diff line
		@@ -99,6 +99,7 @@ Sachin P Sant <ssant@in.ibm.com>
		Sam Ravnborg <sam@mars.ravnborg.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>
		Simon Kelley <simon@thekelleys.org.uk>
		Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
		Stephen Hemminger <shemminger@osdl.org>

MAINTAINERS

+1 −1

Original line number	Diff line number	Diff line
		@@ -8315,7 +8315,7 @@ F: include/linux/compiler.h

		SPEAR PLATFORM SUPPORT
		M: Viresh Kumar <viresh.linux@gmail.com>
		M: Shiraz Hashim <shiraz.hashim@st.com>
		M: Shiraz Hashim <shiraz.linux.kernel@gmail.com>
		L: spear-devel@list.st.com
		L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
		W: http://www.st.com/spear

arch/arm/boot/dts/spear320-hmi.dts

+1 −1

Original line number	Diff line number	Diff line
		/*
		* DTS file for SPEAr320 Evaluation Baord
		*
		* Copyright 2012 Shiraz Hashim <shiraz.hashim@st.com>
		* Copyright 2012 Shiraz Hashim <shiraz.linux.kernel@gmail.com>
		*
		* The code contained herein is licensed under the GNU General Public
		* License. You may obtain a copy of the GNU General Public License

arch/arm/mach-spear/headsmp.S

+1 −1

Original line number	Diff line number	Diff line
		@@ -3,7 +3,7 @@
		*
		* Picked from realview
		* Copyright (c) 2012 ST Microelectronics Limited
		* Shiraz Hashim <shiraz.hashim@st.com>
		* Shiraz Hashim <shiraz.linux.kernel@gmail.com>
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 as

arch/arm/mach-spear/platsmp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@
		* based upon linux/arch/arm/mach-realview/platsmp.c
		*
		* Copyright (C) 2012 ST Microelectronics Ltd.
		* Shiraz Hashim <shiraz.hashim@st.com>
		* Shiraz Hashim <shiraz.linux.kernel@gmail.com>
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 as