Commit 9cc23682 authored by Viresh Kumar's avatar Viresh Kumar Committed by Linus Torvalds

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: default avatarViresh Kumar <viresh.kumar@linaro.org>
Cc: Shiraz Hashim <shiraz.linux.kernel@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8f28ed92
...@@ -99,6 +99,7 @@ Sachin P Sant <ssant@in.ibm.com> ...@@ -99,6 +99,7 @@ Sachin P Sant <ssant@in.ibm.com>
Sam Ravnborg <sam@mars.ravnborg.org> Sam Ravnborg <sam@mars.ravnborg.org>
Sascha Hauer <s.hauer@pengutronix.de> Sascha Hauer <s.hauer@pengutronix.de>
S.Çağlar Onur <caglar@pardus.org.tr> 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> Simon Kelley <simon@thekelleys.org.uk>
Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr> Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
Stephen Hemminger <shemminger@osdl.org> Stephen Hemminger <shemminger@osdl.org>
......
...@@ -8315,7 +8315,7 @@ F: include/linux/compiler.h ...@@ -8315,7 +8315,7 @@ F: include/linux/compiler.h
SPEAR PLATFORM SUPPORT SPEAR PLATFORM SUPPORT
M: Viresh Kumar <viresh.linux@gmail.com> 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: spear-devel@list.st.com
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
W: http://www.st.com/spear W: http://www.st.com/spear
......
/* /*
* DTS file for SPEAr320 Evaluation Baord * 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 * The code contained herein is licensed under the GNU General Public
* License. You may obtain a copy of the GNU General Public License * License. You may obtain a copy of the GNU General Public License
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* *
* Picked from realview * Picked from realview
* Copyright (c) 2012 ST Microelectronics Limited * 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 * 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 * it under the terms of the GNU General Public License version 2 as
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* based upon linux/arch/arm/mach-realview/platsmp.c * based upon linux/arch/arm/mach-realview/platsmp.c
* *
* Copyright (C) 2012 ST Microelectronics Ltd. * 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 * 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 * it under the terms of the GNU General Public License version 2 as
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* arch/arm/plat-spear/time.c * arch/arm/plat-spear/time.c
* *
* Copyright (C) 2010 ST Microelectronics * Copyright (C) 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 * This file is licensed under the terms of the GNU General Public
* License version 2. This program is licensed "as is" without any * License version 2. This program is licensed "as is" without any
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* SPEAr platform SPI chipselect abstraction over gpiolib * SPEAr platform SPI chipselect abstraction over gpiolib
* *
* Copyright (C) 2012 ST Microelectronics * Copyright (C) 2012 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 * This file is licensed under the terms of the GNU General Public
* License version 2. This program is licensed "as is" without any * License version 2. This program is licensed "as is" without any
...@@ -205,6 +205,6 @@ static int __init spics_gpio_init(void) ...@@ -205,6 +205,6 @@ static int __init spics_gpio_init(void)
} }
subsys_initcall(spics_gpio_init); subsys_initcall(spics_gpio_init);
MODULE_AUTHOR("Shiraz Hashim <shiraz.hashim@st.com>"); MODULE_AUTHOR("Shiraz Hashim <shiraz.linux.kernel@gmail.com>");
MODULE_DESCRIPTION("ST Microlectronics SPEAr SPI Chip Select Abstraction"); MODULE_DESCRIPTION("ST Microlectronics SPEAr SPI Chip Select Abstraction");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
* Viresh Kumar <viresh.linux@gmail.com> * Viresh Kumar <viresh.linux@gmail.com>
* *
* Copyright (C) 2012 ST Microelectronics * Copyright (C) 2012 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 * This file is licensed under the terms of the GNU General Public
* License version 2. This program is licensed "as is" without any * License version 2. This program is licensed "as is" without any
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* *
* Copyright © 2010 STMicroelectronics. * Copyright © 2010 STMicroelectronics.
* Ashish Priyadarshi * Ashish Priyadarshi
* 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 * This file is licensed under the terms of the GNU General Public
* License version 2. This program is licensed "as is" without any * License version 2. This program is licensed "as is" without any
...@@ -1089,5 +1089,5 @@ static struct platform_driver spear_smi_driver = { ...@@ -1089,5 +1089,5 @@ static struct platform_driver spear_smi_driver = {
module_platform_driver(spear_smi_driver); module_platform_driver(spear_smi_driver);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_AUTHOR("Ashish Priyadarshi, Shiraz Hashim <shiraz.hashim@st.com>"); MODULE_AUTHOR("Ashish Priyadarshi, Shiraz Hashim <shiraz.linux.kernel@gmail.com>");
MODULE_DESCRIPTION("MTD SMI driver for serial nor flash chips"); MODULE_DESCRIPTION("MTD SMI driver for serial nor flash chips");
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* ST Microelectronics SPEAr Pulse Width Modulator driver * ST Microelectronics SPEAr Pulse Width Modulator driver
* *
* Copyright (C) 2012 ST Microelectronics * Copyright (C) 2012 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 * This file is licensed under the terms of the GNU General Public
* License version 2. This program is licensed "as is" without any * License version 2. This program is licensed "as is" without any
...@@ -264,6 +264,6 @@ static struct platform_driver spear_pwm_driver = { ...@@ -264,6 +264,6 @@ static struct platform_driver spear_pwm_driver = {
module_platform_driver(spear_pwm_driver); module_platform_driver(spear_pwm_driver);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_AUTHOR("Shiraz Hashim <shiraz.hashim@st.com>"); MODULE_AUTHOR("Shiraz Hashim <shiraz.linux.kernel@gmail.com>");
MODULE_AUTHOR("Viresh Kumar <viresh.kumar@linaro.com>"); MODULE_AUTHOR("Viresh Kumar <viresh.kumar@linaro.com>");
MODULE_ALIAS("platform:spear-pwm"); MODULE_ALIAS("platform:spear-pwm");
/* /*
* Copyright © 2010 ST Microelectronics * 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 * This file is licensed under the terms of the GNU General Public
* License version 2. This program is licensed "as is" without any * License version 2. This program is licensed "as is" without any
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment