diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-10-30 14:39:02 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-10-30 14:39:02 -0400 |
| commit | 31271e9aacaa3c3460cbad8ec62fb5a04a522f5b (patch) | |
| tree | 815c671dac14e0e07959dc88e94c36a994f9c460 /arch/hexagon/mm/ioremap.c | |
| parent | 32111abb508424d1d110fa471d940160abe251f5 (diff) | |
| parent | dc4dc36056392c0b0b1ca9e81bebff964b9297e0 (diff) | |
Merge branch 'spi-tegra' into spi-next
Diffstat (limited to 'arch/hexagon/mm/ioremap.c')
| -rw-r--r-- | arch/hexagon/mm/ioremap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/hexagon/mm/ioremap.c b/arch/hexagon/mm/ioremap.c index 3a37bc3b0116..5905fd5f97f6 100644 --- a/arch/hexagon/mm/ioremap.c +++ b/arch/hexagon/mm/ioremap.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * I/O remap functions for Hexagon | 2 | * I/O remap functions for Hexagon |
| 3 | * | 3 | * |
| 4 | * Copyright (c) 2010-2011, Code Aurora Forum. All rights reserved. | 4 | * Copyright (c) 2010-2011, The Linux Foundation. All rights reserved. |
| 5 | * | 5 | * |
| 6 | * This program is free software; you can redistribute it and/or modify | 6 | * This program is free software; you can redistribute it and/or modify |
| 7 | * it under the terms of the GNU General Public License version 2 and | 7 | * it under the terms of the GNU General Public License version 2 and |