diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-07-11 09:41:37 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-07-11 09:41:37 +0200 |
| commit | 92254d31444aad272155f7963e65910c402703dd (patch) | |
| tree | 8e454ebe60cbac9a71b1771d4e471cfe54826963 /arch/arm/boot/dts/spear1340-evb.dts | |
| parent | Merge tag 'amd-thresholding-fixes-for-3.6' of git://git.kernel.org/pub/scm/li... (diff) | |
| parent | Linux 3.5-rc6 (diff) | |
| download | linux-92254d31444aad272155f7963e65910c402703dd.tar.xz linux-92254d31444aad272155f7963e65910c402703dd.zip | |
Merge tag 'v3.5-rc6' into x86/mce
Merge Linux 3.5-rc6 before merging more code.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/boot/dts/spear1340-evb.dts')
| -rw-r--r-- | arch/arm/boot/dts/spear1340-evb.dts | 2 |
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 |