diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2015-08-13 14:42:55 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2015-08-13 14:42:55 +0200 |
| commit | 5f6f02cd49d61e9856ff2c337578316a1a1b3f88 (patch) | |
| tree | fd2e6961e8f609af41dd4a282008e1bc52cfa7c7 /arch/arm/mach-spear/spear320.c | |
| parent | 3afa129a9de0957d72165cf08a54e5c69938011c (diff) | |
| parent | cbfe8fa6cd672011c755c3cd85c9ffd4e2d10a6f (diff) | |
| download | op-kernel-dev-5f6f02cd49d61e9856ff2c337578316a1a1b3f88.zip op-kernel-dev-5f6f02cd49d61e9856ff2c337578316a1a1b3f88.tar.gz | |
Merge tag 'v4.2-rc4' into devel
Linux 4.2-rc4
Diffstat (limited to 'arch/arm/mach-spear/spear320.c')
| -rw-r--r-- | arch/arm/mach-spear/spear320.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-spear/spear320.c b/arch/arm/mach-spear/spear320.c index bf634b3..d45d751 100644 --- a/arch/arm/mach-spear/spear320.c +++ b/arch/arm/mach-spear/spear320.c @@ -4,7 +4,7 @@ * SPEAr320 machine source file * * Copyright (C) 2009-2012 ST Microelectronics - * Viresh Kumar <viresh.linux@gmail.com> + * Viresh Kumar <vireshk@kernel.org> * * This file is licensed under the terms of the GNU General Public * License version 2. This program is licensed "as is" without any |
