diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-07-30 11:13:03 +0400 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2012-07-30 11:13:03 +0400 |
| commit | fcb06702f023a0e7b1e6ebf9746f34b610ca0508 (patch) | |
| tree | db022324c4978dd9af059be38822d23455a45f55 /arch/arm/boot/dts/spear1340.dtsi | |
| parent | 5e31fc0815a4e2c72b1b495fe7a0d8f9bfb9e4b4 (diff) | |
| parent | 9dbf5f55f8d35ff9aedc75267f4e4042aaf89755 (diff) | |
| download | linux-fcb06702f023a0e7b1e6ebf9746f34b610ca0508.tar.xz | |
Merge remote-tracking branch 'wireless/master' into mac80211
Diffstat (limited to 'arch/arm/boot/dts/spear1340.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/spear1340.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/spear1340.dtsi b/arch/arm/boot/dts/spear1340.dtsi index a26fc47a55e8..d71fe2a68f09 100644 --- a/arch/arm/boot/dts/spear1340.dtsi +++ b/arch/arm/boot/dts/spear1340.dtsi @@ -1,7 +1,7 @@ /* * DTS file for all SPEAr1340 SoCs * - * 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 |