diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-11 12:50:20 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-11 12:50:20 +0200 |
| commit | 0dc19510430b20b3b2d6d1b9b796fd42fa2af64a (patch) | |
| tree | a512cf400d74d72272ce6cf5c4d782538213d433 /arch/arm/mach-spear13xx/include/mach/spear.h | |
| parent | b52a2c472d7fcf215e31dffdd382651e1b99f138 (diff) | |
| parent | bd0a521e88aa7a06ae7aabaed7ae196ed4ad867a (diff) | |
Merge tag 'v3.5-rc6' into next/soc
Linux 3.5-rc6
Dependency for imx/soc changes
Diffstat (limited to 'arch/arm/mach-spear13xx/include/mach/spear.h')
| -rw-r--r-- | arch/arm/mach-spear13xx/include/mach/spear.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-spear13xx/include/mach/spear.h b/arch/arm/mach-spear13xx/include/mach/spear.h index 30c57ef72686..65f27def239b 100644 --- a/arch/arm/mach-spear13xx/include/mach/spear.h +++ b/arch/arm/mach-spear13xx/include/mach/spear.h @@ -4,7 +4,7 @@ * spear13xx Machine family specific definition * * Copyright (C) 2012 ST Microelectronics - * Viresh Kumar <viresh.kumar@st.com> + * Viresh Kumar <viresh.linux@gmail.com> * * This file is licensed under the terms of the GNU General Public * License version 2. This program is licensed "as is" without any |