Merge branch 'renesas/fixes' into renesas/soc
authorArnd Bergmann <arnd@arndb.de>
Thu, 15 Mar 2012 17:26:43 +0000 (17:26 +0000)
committerArnd Bergmann <arnd@arndb.de>
Thu, 15 Mar 2012 17:33:38 +0000 (17:33 +0000)
commit5cd9eb2736a572a9ef2689829f47ffd4262adc00
tree380bcc1d77acc968e9ae9c8da9215b8b04edba1f
parenta6e24019468009a21b674e392d74283a90f415dd
parente49d603c181b6004e2f6b5ad6d86daab84f22fe6
Merge branch 'renesas/fixes' into renesas/soc

The fixes branch was merged into mainline just after v3.3-rc7,
I'm merging it into this branch to fix up a nontrivial merge
conflict. Unfortunately this means that we are now based on
a commit between -rc releases, which we normally try to avoid.

Conflicts:
arch/arm/mach-shmobile/board-mackerel.c

Resolution suggested by Laurent Pinchart <laurent.pinchart@ideasonboard.com>

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/arm/mach-shmobile/board-ag5evm.c
arch/arm/mach-shmobile/board-ap4evb.c
arch/arm/mach-shmobile/board-bonito.c
arch/arm/mach-shmobile/board-mackerel.c