From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 22 Mar 2012 22:02:16 +0000 (+0000)
Subject: Merge branch 'rmobile-fixes-for-linus' of git://github.com/pmundt/linux-sh into renes... 
X-Git-Tag: v3.4-rc1~72^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=426f1af947c61dee48a9267f84bff227e503a547;p=pandora-kernel.git

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>
---

426f1af947c61dee48a9267f84bff227e503a547
Reading git-diff-tree failed