From: Olof Johansson <olof@lixom.net>
Date: Tue, 11 Jun 2013 07:32:57 +0000 (-0700)
Subject: Merge branch 'renesas/soc' into next/boards
X-Git-Tag: omap-for-v3.11/fixes-for-merge-window~70^2~10
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41f0d0c25d4ccba8de8d5f463d50265aac23ef5d;p=pandora-kernel.git

Merge branch 'renesas/soc' into next/boards

Signed-off-by: Olof Johansson <olof@lixom.net>

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

41f0d0c25d4ccba8de8d5f463d50265aac23ef5d
Reading git-diff-tree failed