Merge tag 'vexpress/fixes-for-3.15' of git://git.linaro.org/people/pawel.moll/linux...

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-spear / time.c

diff --git a/arch/arm/mach-spear/time.c b/arch/arm/mach-spear/time.c
index c4d0931fc6ee195ef701804a8ab452a1abfb2fc5..26fda4ed4d51413301d148477cd4d18e2bef7884 100644 (file)
--- 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@st.com>
+ * Shiraz Hashim<shiraz.linux.kernel@gmail.com>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any