diff options
| author | Olof Johansson <olof@lixom.net> | 2013-06-14 18:25:54 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-06-14 18:25:54 -0400 |
| commit | 0d6128f85a16ad290ba32099a622c4b1aaa73641 (patch) | |
| tree | 969f0f2b31ee5386f6b87fc6dffaaf37e6aca90b | |
| parent | 9d6dec733b3ebbd6f259d7defbb62f9c62ec2022 (diff) | |
| parent | e57a9a4b97231c2ed4c03c7b6f692b632d538993 (diff) | |
Merge tag 'davinci-for-v3.11/board' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/fixes-non-critical
From Sekhar Nori:
This pull request contains a trival change
to drop a stale maintainer name and address.
* tag 'davinci-for-v3.11/board' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
ARM: davinci: remove stale SFFSDR maintainer name
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/mach-davinci/board-sffsdr.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/board-sffsdr.c b/arch/arm/mach-davinci/board-sffsdr.c index 739be7e738fe..513eee14f77d 100644 --- a/arch/arm/mach-davinci/board-sffsdr.c +++ b/arch/arm/mach-davinci/board-sffsdr.c | |||
| @@ -151,7 +151,6 @@ static __init void davinci_sffsdr_init(void) | |||
| 151 | } | 151 | } |
| 152 | 152 | ||
| 153 | MACHINE_START(SFFSDR, "Lyrtech SFFSDR") | 153 | MACHINE_START(SFFSDR, "Lyrtech SFFSDR") |
| 154 | /* Maintainer: Hugo Villeneuve hugo.villeneuve@lyrtech.com */ | ||
| 155 | .atag_offset = 0x100, | 154 | .atag_offset = 0x100, |
| 156 | .map_io = davinci_sffsdr_map_io, | 155 | .map_io = davinci_sffsdr_map_io, |
| 157 | .init_irq = davinci_irq_init, | 156 | .init_irq = davinci_irq_init, |