tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

Viresh Kumar and committed by
Linus Torvalds 9cc23682 8f28ed92

+14 -13
+1
.mailmap
··· 99 99 Sam Ravnborg <sam@mars.ravnborg.org> 100 100 Sascha Hauer <s.hauer@pengutronix.de> 101 101 S.Çağlar Onur <caglar@pardus.org.tr> 102 + Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com> 102 103 Simon Kelley <simon@thekelleys.org.uk> 103 104 Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr> 104 105 Stephen Hemminger <shemminger@osdl.org>
+1 -1
MAINTAINERS
··· 8315 8315 8316 8316 SPEAR PLATFORM SUPPORT 8317 8317 M: Viresh Kumar <viresh.linux@gmail.com> 8318 - M: Shiraz Hashim <shiraz.hashim@st.com> 8318 + M: Shiraz Hashim <shiraz.linux.kernel@gmail.com> 8319 8319 L: spear-devel@list.st.com 8320 8320 L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 8321 8321 W: http://www.st.com/spear
+1 -1
arch/arm/boot/dts/spear320-hmi.dts
··· 1 1 /* 2 2 * DTS file for SPEAr320 Evaluation Baord 3 3 * 4 - * Copyright 2012 Shiraz Hashim <shiraz.hashim@st.com> 4 + * Copyright 2012 Shiraz Hashim <shiraz.linux.kernel@gmail.com> 5 5 * 6 6 * The code contained herein is licensed under the GNU General Public 7 7 * License. You may obtain a copy of the GNU General Public License
+1 -1
arch/arm/mach-spear/headsmp.S
··· 3 3 * 4 4 * Picked from realview 5 5 * Copyright (c) 2012 ST Microelectronics Limited 6 - * Shiraz Hashim <shiraz.hashim@st.com> 6 + * Shiraz Hashim <shiraz.linux.kernel@gmail.com> 7 7 * 8 8 * This program is free software; you can redistribute it and/or modify 9 9 * it under the terms of the GNU General Public License version 2 as
+1 -1
arch/arm/mach-spear/platsmp.c
··· 4 4 * based upon linux/arch/arm/mach-realview/platsmp.c 5 5 * 6 6 * Copyright (C) 2012 ST Microelectronics Ltd. 7 - * Shiraz Hashim <shiraz.hashim@st.com> 7 + * Shiraz Hashim <shiraz.linux.kernel@gmail.com> 8 8 * 9 9 * This program is free software; you can redistribute it and/or modify 10 10 * it under the terms of the GNU General Public License version 2 as
+1 -1
arch/arm/mach-spear/time.c
··· 2 2 * arch/arm/plat-spear/time.c 3 3 * 4 4 * Copyright (C) 2010 ST Microelectronics 5 - * Shiraz Hashim<shiraz.hashim@st.com> 5 + * Shiraz Hashim<shiraz.linux.kernel@gmail.com> 6 6 * 7 7 * This file is licensed under the terms of the GNU General Public 8 8 * License version 2. This program is licensed "as is" without any
+2 -2
drivers/gpio/gpio-spear-spics.c
··· 2 2 * SPEAr platform SPI chipselect abstraction over gpiolib 3 3 * 4 4 * Copyright (C) 2012 ST Microelectronics 5 - * Shiraz Hashim <shiraz.hashim@st.com> 5 + * Shiraz Hashim <shiraz.linux.kernel@gmail.com> 6 6 * 7 7 * This file is licensed under the terms of the GNU General Public 8 8 * License version 2. This program is licensed "as is" without any ··· 205 205 } 206 206 subsys_initcall(spics_gpio_init); 207 207 208 - MODULE_AUTHOR("Shiraz Hashim <shiraz.hashim@st.com>"); 208 + MODULE_AUTHOR("Shiraz Hashim <shiraz.linux.kernel@gmail.com>"); 209 209 MODULE_DESCRIPTION("ST Microlectronics SPEAr SPI Chip Select Abstraction"); 210 210 MODULE_LICENSE("GPL");
+1 -1
drivers/irqchip/spear-shirq.c
··· 5 5 * Viresh Kumar <viresh.linux@gmail.com> 6 6 * 7 7 * Copyright (C) 2012 ST Microelectronics 8 - * Shiraz Hashim <shiraz.hashim@st.com> 8 + * Shiraz Hashim <shiraz.linux.kernel@gmail.com> 9 9 * 10 10 * This file is licensed under the terms of the GNU General Public 11 11 * License version 2. This program is licensed "as is" without any
+2 -2
drivers/mtd/devices/spear_smi.c
··· 6 6 * 7 7 * Copyright © 2010 STMicroelectronics. 8 8 * Ashish Priyadarshi 9 - * Shiraz Hashim <shiraz.hashim@st.com> 9 + * Shiraz Hashim <shiraz.linux.kernel@gmail.com> 10 10 * 11 11 * This file is licensed under the terms of the GNU General Public 12 12 * License version 2. This program is licensed "as is" without any ··· 1089 1089 module_platform_driver(spear_smi_driver); 1090 1090 1091 1091 MODULE_LICENSE("GPL"); 1092 - MODULE_AUTHOR("Ashish Priyadarshi, Shiraz Hashim <shiraz.hashim@st.com>"); 1092 + MODULE_AUTHOR("Ashish Priyadarshi, Shiraz Hashim <shiraz.linux.kernel@gmail.com>"); 1093 1093 MODULE_DESCRIPTION("MTD SMI driver for serial nor flash chips");
+2 -2
drivers/pwm/pwm-spear.c
··· 2 2 * ST Microelectronics SPEAr Pulse Width Modulator driver 3 3 * 4 4 * Copyright (C) 2012 ST Microelectronics 5 - * Shiraz Hashim <shiraz.hashim@st.com> 5 + * Shiraz Hashim <shiraz.linux.kernel@gmail.com> 6 6 * 7 7 * This file is licensed under the terms of the GNU General Public 8 8 * License version 2. This program is licensed "as is" without any ··· 264 264 module_platform_driver(spear_pwm_driver); 265 265 266 266 MODULE_LICENSE("GPL"); 267 - MODULE_AUTHOR("Shiraz Hashim <shiraz.hashim@st.com>"); 267 + MODULE_AUTHOR("Shiraz Hashim <shiraz.linux.kernel@gmail.com>"); 268 268 MODULE_AUTHOR("Viresh Kumar <viresh.kumar@linaro.com>"); 269 269 MODULE_ALIAS("platform:spear-pwm");
+1 -1
include/linux/mtd/spear_smi.h
··· 1 1 /* 2 2 * Copyright © 2010 ST Microelectronics 3 - * Shiraz Hashim <shiraz.hashim@st.com> 3 + * Shiraz Hashim <shiraz.linux.kernel@gmail.com> 4 4 * 5 5 * This file is licensed under the terms of the GNU General Public 6 6 * License version 2. This program is licensed "as is" without any