diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-07-20 03:42:59 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-07-20 03:42:59 -0400 |
| commit | 9ff561fdf73493d757bbc74aa58627e1381650fb (patch) | |
| tree | 4484d230662126b1ac94ea545ca5429c91e0a68b /arch/arm/boot/dts/spear320.dtsi | |
| parent | 7b98cf0cf4e8798b9e7435f966ed0d90a2a925de (diff) | |
| parent | fdd85ec3eb8cc1b663678a3efa16ee59a32e0277 (diff) | |
Merge branch 'common/pinctrl' into sh-latest
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 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * DTS file for SPEAr320 SoC | 2 | * DTS file for SPEAr320 SoC |
| 3 | * | 3 | * |
| 4 | * Copyright 2012 Viresh Kumar <viresh.kumar@st.com> | 4 | * Copyright 2012 Viresh Kumar <viresh.linux@gmail.com> |
| 5 | * | 5 | * |
| 6 | * The code contained herein is licensed under the GNU General Public | 6 | * The code contained herein is licensed under the GNU General Public |
| 7 | * License. You may obtain a copy of the GNU General Public License | 7 | * License. You may obtain a copy of the GNU General Public License |