diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-25 18:31:00 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-25 18:31:00 +0200 |
| commit | bcc66c0b8881f88459f9ac21038455bcafacdc6e (patch) | |
| tree | b402e677253c3fc1038ca4a52fc54fc223261133 /arch/arm/boot/dts/spear320.dtsi | |
| parent | staging: r8712u: Remove useless driver version info (diff) | |
| parent | Linux 3.5-rc4 (diff) | |
| download | linux-bcc66c0b8881f88459f9ac21038455bcafacdc6e.tar.xz linux-bcc66c0b8881f88459f9ac21038455bcafacdc6e.zip | |
Merge 3.5-rc4 into staging-next
This picks up the staging changes made in 3.5-rc4 so that everyone can sync up
properly.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/boot/dts/spear320.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/spear320.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/spear320.dtsi b/arch/arm/boot/dts/spear320.dtsi index 5372ca399b1f..1f49d69595a0 100644 --- a/arch/arm/boot/dts/spear320.dtsi +++ b/arch/arm/boot/dts/spear320.dtsi @@ -1,7 +1,7 @@ /* * DTS file for SPEAr320 SoC * - * 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 |