[PATCH] Shiraz has moved

From: Viresh Kumar
Date: Fri Apr 04 2014 - 01:19:05 EST

Next message: Michal Simek: "Re: [PATCH 1/2] devicetree: Add devicetree bindings documentation for Zynq Quad SPI"
Previous message: Lad, Prabhakar: "[PATCH v2 1/2] media: davinci: vpif capture: upgrade the driver with v4l offerings"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

shiraz.hashim@xxxxxx email-id doesn't exist anymore as he has left the
company. Replace ST's id with shiraz.linux.kernel@xxxxxxxxxx

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

Cc: Shiraz Hashim <shiraz.linux.kernel@xxxxxxxxx>
Signed-off-by: Viresh Kumar <viresh.kumar@xxxxxxxxxx>
---
.mailmap | 1 +
MAINTAINERS | 2 +-
arch/arm/boot/dts/spear320-hmi.dts | 2 +-
arch/arm/mach-spear/headsmp.S | 2 +-
arch/arm/mach-spear/platsmp.c | 2 +-
arch/arm/mach-spear/time.c | 2 +-
drivers/gpio/gpio-spear-spics.c | 4 ++--
drivers/irqchip/spear-shirq.c | 2 +-
drivers/mtd/devices/spear_smi.c | 4 ++--
drivers/pwm/pwm-spear.c | 4 ++--
include/linux/mtd/spear_smi.h | 2 +-
11 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/.mailmap b/.mailmap
index 658003a..df1baba 100644
--- a/.mailmap
+++ b/.mailmap
@@ -99,6 +99,7 @@ Sachin P Sant <ssant@xxxxxxxxxx>
Sam Ravnborg <sam@xxxxxxxxxxxxxxxxx>
Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
S.ÃaÄlar Onur <caglar@xxxxxxxxxxxxx>
+Shiraz Hashim <shiraz.linux.kernel@xxxxxxxxx> <shiraz.hashim@xxxxxx>
Simon Kelley <simon@xxxxxxxxxxxxxxxxx>
StÃphane Witzmann <stephane.witzmann@xxxxxxxxxxxxxxxxxxxxxxxxx>
Stephen Hemminger <shemminger@xxxxxxxx>
diff --git a/MAINTAINERS b/MAINTAINERS
index edd6139..014e5d6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8143,7 +8143,7 @@ F: include/linux/compiler.h

SPEAR PLATFORM SUPPORT
M: Viresh Kumar <viresh.linux@xxxxxxxxx>
-M: Shiraz Hashim <shiraz.hashim@xxxxxx>
+M: Shiraz Hashim <shiraz.linux.kernel@xxxxxxxxx>
L: spear-devel@xxxxxxxxxxx
L: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx (moderated for non-subscribers)
W: http://www.st.com/spear
diff --git a/arch/arm/boot/dts/spear320-hmi.dts b/arch/arm/boot/dts/spear320-hmi.dts
index 3075d2d..0aa6fef 100644
--- a/arch/arm/boot/dts/spear320-hmi.dts
+++ b/arch/arm/boot/dts/spear320-hmi.dts
@@ -1,7 +1,7 @@
/*
* DTS file for SPEAr320 Evaluation Baord
*
- * Copyright 2012 Shiraz Hashim <shiraz.hashim@xxxxxx>
+ * Copyright 2012 Shiraz Hashim <shiraz.linux.kernel@xxxxxxxxx>
*
* The code contained herein is licensed under the GNU General Public
* License. You may obtain a copy of the GNU General Public License
diff --git a/arch/arm/mach-spear/headsmp.S b/arch/arm/mach-spear/headsmp.S
index ed85473..c52192d 100644
--- a/arch/arm/mach-spear/headsmp.S
+++ b/arch/arm/mach-spear/headsmp.S
@@ -3,7 +3,7 @@
*
* Picked from realview
* Copyright (c) 2012 ST Microelectronics Limited
- * Shiraz Hashim <shiraz.hashim@xxxxxx>
+ * Shiraz Hashim <shiraz.linux.kernel@xxxxxxxxx>
*
* 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
diff --git a/arch/arm/mach-spear/platsmp.c b/arch/arm/mach-spear/platsmp.c
index 5c4a198..c19751f 100644
--- a/arch/arm/mach-spear/platsmp.c
+++ b/arch/arm/mach-spear/platsmp.c
@@ -4,7 +4,7 @@
* based upon linux/arch/arm/mach-realview/platsmp.c
*
* Copyright (C) 2012 ST Microelectronics Ltd.
- * Shiraz Hashim <shiraz.hashim@xxxxxx>
+ * Shiraz Hashim <shiraz.linux.kernel@xxxxxxxxx>
*
* 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
diff --git a/arch/arm/mach-spear/time.c b/arch/arm/mach-spear/time.c
index d449673..e43516d 100644
--- a/arch/arm/mach-spear/time.c
+++ b/arch/arm/mach-spear/time.c
@@ -2,7 +2,7 @@
* arch/arm/plat-spear/time.c
*
* Copyright (C) 2010 ST Microelectronics
- * Shiraz Hashim<shiraz.hashim@xxxxxx>
+ * Shiraz Hashim<shiraz.linux.kernel@xxxxxxxxx>
*
* This file is licensed under the terms of the GNU General Public
* License version 2. This program is licensed "as is" without any
diff --git a/drivers/gpio/gpio-spear-spics.c b/drivers/gpio/gpio-spear-spics.c
index e9a0415..30bcc53 100644
--- a/drivers/gpio/gpio-spear-spics.c
+++ b/drivers/gpio/gpio-spear-spics.c
@@ -2,7 +2,7 @@
* SPEAr platform SPI chipselect abstraction over gpiolib
*
* Copyright (C) 2012 ST Microelectronics
- * Shiraz Hashim <shiraz.hashim@xxxxxx>
+ * Shiraz Hashim <shiraz.linux.kernel@xxxxxxxxx>
*
* This file is licensed under the terms of the GNU General Public
* License version 2. This program is licensed "as is" without any
@@ -205,6 +205,6 @@ static int __init spics_gpio_init(void)
}
subsys_initcall(spics_gpio_init);

-MODULE_AUTHOR("Shiraz Hashim <shiraz.hashim@xxxxxx>");
+MODULE_AUTHOR("Shiraz Hashim <shiraz.linux.kernel@xxxxxxxxx>");
MODULE_DESCRIPTION("ST Microlectronics SPEAr SPI Chip Select Abstraction");
MODULE_LICENSE("GPL");
diff --git a/drivers/irqchip/spear-shirq.c b/drivers/irqchip/spear-shirq.c
index 8527743..3fdda3a 100644
--- a/drivers/irqchip/spear-shirq.c
+++ b/drivers/irqchip/spear-shirq.c
@@ -5,7 +5,7 @@
* Viresh Kumar <viresh.linux@xxxxxxxxx>
*
* Copyright (C) 2012 ST Microelectronics
- * Shiraz Hashim <shiraz.hashim@xxxxxx>
+ * Shiraz Hashim <shiraz.linux.kernel@xxxxxxxxx>
*
* This file is licensed under the terms of the GNU General Public
* License version 2. This program is licensed "as is" without any
diff --git a/drivers/mtd/devices/spear_smi.c b/drivers/mtd/devices/spear_smi.c
index 4238214..e52c880 100644
--- a/drivers/mtd/devices/spear_smi.c
+++ b/drivers/mtd/devices/spear_smi.c
@@ -6,7 +6,7 @@
*
* Copyright Â 2010 STMicroelectronics.
* Ashish Priyadarshi
- * Shiraz Hashim <shiraz.hashim@xxxxxx>
+ * Shiraz Hashim <shiraz.linux.kernel@xxxxxxxxx>
*
* This file is licensed under the terms of the GNU General Public
* License version 2. This program is licensed "as is" without any
@@ -1091,5 +1091,5 @@ static struct platform_driver spear_smi_driver = {
module_platform_driver(spear_smi_driver);

MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Ashish Priyadarshi, Shiraz Hashim <shiraz.hashim@xxxxxx>");
+MODULE_AUTHOR("Ashish Priyadarshi, Shiraz Hashim <shiraz.linux.kernel@xxxxxxxxx>");
MODULE_DESCRIPTION("MTD SMI driver for serial nor flash chips");
diff --git a/drivers/pwm/pwm-spear.c b/drivers/pwm/pwm-spear.c
index 8ad26b8..cb2d4f0 100644
--- a/drivers/pwm/pwm-spear.c
+++ b/drivers/pwm/pwm-spear.c
@@ -2,7 +2,7 @@
* ST Microelectronics SPEAr Pulse Width Modulator driver
*
* Copyright (C) 2012 ST Microelectronics
- * Shiraz Hashim <shiraz.hashim@xxxxxx>
+ * Shiraz Hashim <shiraz.linux.kernel@xxxxxxxxx>
*
* This file is licensed under the terms of the GNU General Public
* License version 2. This program is licensed "as is" without any
@@ -264,6 +264,6 @@ static struct platform_driver spear_pwm_driver = {
module_platform_driver(spear_pwm_driver);

MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Shiraz Hashim <shiraz.hashim@xxxxxx>");
+MODULE_AUTHOR("Shiraz Hashim <shiraz.linux.kernel@xxxxxxxxx>");
MODULE_AUTHOR("Viresh Kumar <viresh.kumar@xxxxxxxxxx>");
MODULE_ALIAS("platform:spear-pwm");
diff --git a/include/linux/mtd/spear_smi.h b/include/linux/mtd/spear_smi.h
index 8ae1726..581603a 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@xxxxxx>
+ * Shiraz Hashim <shiraz.linux.kernel@xxxxxxxxx>
*
* This file is licensed under the terms of the GNU General Public
* License version 2. This program is licensed "as is" without any
--
1.7.12.rc2.18.g61b472e

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Next message: Michal Simek: "Re: [PATCH 1/2] devicetree: Add devicetree bindings documentation for Zynq Quad SPI"
Previous message: Lad, Prabhakar: "[PATCH v2 1/2] media: davinci: vpif capture: upgrade the driver with v4l offerings"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]