From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 27 Jun 2013 12:26:06 +0000 (+0200)
Subject: Merge branch 'renesas/boards2' into next/late
X-Git-Tag: v3.11-rc1~149^2~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4022acdb5b2b65ad2fe078be39bda9c5377c4e04;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge branch 'renesas/boards2' into next/late

Conflicts:
	arch/arm/mach-shmobile/setup-r8a7778.c

This is a dependency for the Renesas sh-sci updates.

Signedf-off-by: Arnd Bergmann <arnd@arndb.de>
---

4022acdb5b2b65ad2fe078be39bda9c5377c4e04