diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-08-05 23:55:52 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-08-06 00:00:32 +0200 |
| commit | b7edaca4e825fd5d7a6ddce3548cc1f7a7337cf8 (patch) | |
| tree | 221d6c5be36fa3b2133200ebc3e520d4382dca8f /arch/arm/mach-spear/pl080.c | |
| parent | c948c26048ecb1023d2e68222c736f7da41da498 (diff) | |
| parent | cbfe8fa6cd672011c755c3cd85c9ffd4e2d10a6f (diff) | |
Merge branch 'linus' into x86/apic
Pull in upstream changes to avoid conflicts
Diffstat (limited to 'arch/arm/mach-spear/pl080.c')
| -rw-r--r-- | arch/arm/mach-spear/pl080.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-spear/pl080.c b/arch/arm/mach-spear/pl080.c index cfa1199d0f4a..b4529f3e0ee9 100644 --- a/arch/arm/mach-spear/pl080.c +++ b/arch/arm/mach-spear/pl080.c @@ -4,7 +4,7 @@ * DMAC pl080 definitions for SPEAr platform * * Copyright (C) 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 |