diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-18 17:22:45 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-18 17:22:45 +0400 |
| commit | 5b1f6d81e4c63ae30d92678cc35081001add7674 (patch) | |
| tree | 8980816357cfe8df56ca9735da73b75c1ed6d235 /arch/arm/plat-spear/include/plat/pl080.h | |
| parent | 8397c76a2c209997c7119bede2f26e51d8c786bc (diff) | |
| parent | 84a1caf1453c3d44050bd22db958af4a7f99315c (diff) | |
| download | linux-5b1f6d81e4c63ae30d92678cc35081001add7674.tar.xz | |
Merge 3.5-rc7 into char-misc-next.
This lets us pick up the mei driver changes that we need in order to
handle future merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/plat-spear/include/plat/pl080.h')
| -rw-r--r-- | arch/arm/plat-spear/include/plat/pl080.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-spear/include/plat/pl080.h b/arch/arm/plat-spear/include/plat/pl080.h index e14a3e4932f9..2bc6b54460a8 100644 --- a/arch/arm/plat-spear/include/plat/pl080.h +++ b/arch/arm/plat-spear/include/plat/pl080.h @@ -4,7 +4,7 @@ * DMAC pl080 definitions for SPEAr platform * * 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 |