diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-22 23:02:16 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-24 20:13:31 +0100 |
| commit | 426f1af947c61dee48a9267f84bff227e503a547 (patch) | |
| tree | adbd2ad224278c58ac483af0b0d77f2c59e54315 /drivers/spi/spi-imx.c | |
| parent | Merge branch 'renesas/fixes' into renesas/soc (diff) | |
| parent | ARM: mach-shmobile: ap4evb: Reserve DMA memory for the frame buffer (diff) | |
| download | linux-426f1af947c61dee48a9267f84bff227e503a547.tar.xz linux-426f1af947c61dee48a9267f84bff227e503a547.zip | |
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 'drivers/spi/spi-imx.c')
0 files changed, 0 insertions, 0 deletions