projects / firefly-linux-kernel-4.4.55.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit426f1af947c61dee48a9267f84bff227e503a547
treeadbd2ad224278c58ac483af0b0d77f2c59e54315tree | snapshot
parent5cd9eb2736a572a9ef2689829f47ffd4262adc00commit | diff
parente9dd7ed2a365b021cdbb35b5cad62f6ab6aeb5d2commit | diff
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>
arch/arm/mach-shmobile/board-ap4evb.c diff1 | diff2 | blob | history
arch/arm/mach-shmobile/board-mackerel.c diff1 | diff2 | blob | history
arch/arm/mach-shmobile/setup-sh7372.c diff1 | diff2 | blob | history
arch/sh/kernel/cpu/sh4a/clock-sh7757.c diff1 | diff2 | blob | history
arch/sh/kernel/cpu/sh4a/clock-sh7785.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.