summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/spear300.dtsi
diff options
context:
space:
mode:
authorChris Zankel <chris@zankel.net>2015-08-30 01:55:58 +0200
committerChris Zankel <chris@zankel.net>2015-08-30 01:55:58 +0200
commit650c919798c71fb34b77a6f2ba03a06907f06a76 (patch)
treed1c60012d4d86846d25f1d0b783b5122c26a2e31 /arch/arm/boot/dts/spear300.dtsi
parentxtensa: improve vmlinux.lds.S sed post-processing (diff)
parentLinux 4.2 (diff)
downloadlinux-650c919798c71fb34b77a6f2ba03a06907f06a76.tar.xz
linux-650c919798c71fb34b77a6f2ba03a06907f06a76.zip
Merge tag 'v4.2' into for_next
Linux 4.2
Diffstat (limited to 'arch/arm/boot/dts/spear300.dtsi')
-rw-r--r--arch/arm/boot/dts/spear300.dtsi2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/spear300.dtsi b/arch/arm/boot/dts/spear300.dtsi
index f79b3dfaabe6..f4e92e599729 100644
--- a/arch/arm/boot/dts/spear300.dtsi
+++ b/arch/arm/boot/dts/spear300.dtsi
@@ -1,7 +1,7 @@
/*
* DTS file for SPEAr300 SoC
*
- * Copyright 2012 Viresh Kumar <viresh.linux@gmail.com>
+ * Copyright 2012 Viresh Kumar <vireshk@kernel.org>
*
* The code contained herein is licensed under the GNU General Public
* License. You may obtain a copy of the GNU General Public License