git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5cd9eb2 e9dd7ed)
Merge branch 'rmobile-fixes-for-linus' of git://github.com/pmundt/linux-sh into renes...
authorArnd Bergmann <arnd@arndb.de>
Thu, 22 Mar 2012 22:02:16 +0000 (22:02 +0000)
committerArnd Bergmann <arnd@arndb.de>
Sat, 24 Mar 2012 19:13:31 +0000 (19:13 +0000)
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>

Trivial merge
Pandora Kernel Repository