diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-11 06:50:20 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-11 06:50:20 -0400 |
| commit | 0dc19510430b20b3b2d6d1b9b796fd42fa2af64a (patch) | |
| tree | a512cf400d74d72272ce6cf5c4d782538213d433 /arch/arm/plat-spear/shirq.c | |
| 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/plat-spear/shirq.c')
| -rw-r--r-- | arch/arm/plat-spear/shirq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-spear/shirq.c b/arch/arm/plat-spear/shirq.c index 961fb7261243..853e891e1184 100644 --- a/arch/arm/plat-spear/shirq.c +++ b/arch/arm/plat-spear/shirq.c | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | * SPEAr platform shared irq layer source file | 4 | * SPEAr platform shared irq layer source file |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2009 ST Microelectronics | 6 | * Copyright (C) 2009 ST Microelectronics |
| 7 | * Viresh Kumar<viresh.kumar@st.com> | 7 | * Viresh Kumar <viresh.linux@gmail.com> |
| 8 | * | 8 | * |
| 9 | * This file is licensed under the terms of the GNU General Public | 9 | * This file is licensed under the terms of the GNU General Public |
| 10 | * License version 2. This program is licensed "as is" without any | 10 | * License version 2. This program is licensed "as is" without any |