diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-22 22:02:16 (GMT) |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-24 19:13:31 (GMT) |
| commit | 426f1af947c61dee48a9267f84bff227e503a547 (patch) | |
| tree | adbd2ad224278c58ac483af0b0d77f2c59e54315 /arch/arm/mach-exynos | |
| parent | 5cd9eb2736a572a9ef2689829f47ffd4262adc00 (diff) | |
| parent | e9dd7ed2a365b021cdbb35b5cad62f6ab6aeb5d2 (diff) | |
| download | linux-fsl-qoriq-426f1af947c61dee48a9267f84bff227e503a547.tar.xz | |
Merge branch 'rmobile-fixes-for-linus' of git://github.com/pmundt/linux-sh into renesas/soc
Conflicts:
arch/arm/mach-shmobile/board-ap4evb.c
This moves the addition of init_consistent_dma_size() from the board
files into the common sh7372_map_io() functions where all the other
contents of the board specific map_io calls have gone.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-exynos')
0 files changed, 0 insertions, 0 deletions