summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/spear1340-evb.dts
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-07-25 21:41:33 +0200
committerArnd Bergmann <arnd@arndb.de>2012-07-25 21:41:33 +0200
commit43cb4a02d27ad9525ad23984d4fd06972810439f (patch)
treec705d059616356054d18c6cd50e7c9f5b16a5747 /arch/arm/boot/dts/spear1340-evb.dts
parent9abf29edbb14a34f86c9e09970adada9f10ccbcf (diff)
parent759af179c72005e61a4dd6dcf909320a134bfeee (diff)
downloadlinux-43cb4a02d27ad9525ad23984d4fd06972810439f.tar.bz2
Merge branch 'board-specific' of git://github.com/hzhuang1/linux into late/board
From Haojian Zhuang <haojian.zhuang@gmail.com>: * 'board-specific' of git://github.com/hzhuang1/linux: ARM: pxa: hx4700: Use DEFINE_RES_* macros consistently ARM: pxa: remove eseries.h It seems I missed this in the original pull requests for v3.6, adding it now. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/spear1340-evb.dts')
-rw-r--r--arch/arm/boot/dts/spear1340-evb.dts2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/spear1340-evb.dts b/arch/arm/boot/dts/spear1340-evb.dts
index 0d8472e5ab9f..c9a54e06fb68 100644
--- a/arch/arm/boot/dts/spear1340-evb.dts
+++ b/arch/arm/boot/dts/spear1340-evb.dts
@@ -1,7 +1,7 @@
/*
* DTS file for SPEAr1340 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