summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/spear1310-evb.dts
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-07-21 23:34:31 +0200
committerArnd Bergmann <arnd@arndb.de>2012-07-21 23:34:31 +0200
commit088eb2a84b3b093af60bbe0b65151e8a9cd2d57d (patch)
tree8f145d8c71f6e249d6664b5482ac216b8c6e4016 /arch/arm/boot/dts/spear1310-evb.dts
parent6217a69a1e38807b3046b4fd6e4bf413e0e03b67 (diff)
parent84a1caf1453c3d44050bd22db958af4a7f99315c (diff)
downloadtalos-op-linux-088eb2a84b3b093af60bbe0b65151e8a9cd2d57d.tar.gz
talos-op-linux-088eb2a84b3b093af60bbe0b65151e8a9cd2d57d.zip
Merge tag 'v3.5-rc7' into late/soc
Linux 3.5-rc7
Diffstat (limited to 'arch/arm/boot/dts/spear1310-evb.dts')
-rw-r--r--arch/arm/boot/dts/spear1310-evb.dts2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/spear1310-evb.dts b/arch/arm/boot/dts/spear1310-evb.dts
index 8314e4171884..dd4358bc26e2 100644
--- a/arch/arm/boot/dts/spear1310-evb.dts
+++ b/arch/arm/boot/dts/spear1310-evb.dts
@@ -1,7 +1,7 @@
/*
* DTS file for SPEAr1310 Evaluation Baord
*
- * Copyright 2012 Viresh Kumar <viresh.kumar@st.com>
+ * Copyright 2012 Viresh Kumar <viresh.linux@gmail.com>
*
* The code contained herein is licensed under the GNU General Public
* License. You may obtain a copy of the GNU General Public License
OpenPOWER on IntegriCloud