From: Simon Horman <horms+renesas@verge.net.au>
Date: Thu, 13 Jun 2013 05:45:20 +0000 (+0900)
Subject: Merge tags 'renesas-pinmux-for-v3.11' and 'renesas-soc-for-v3.11' into cleanup
X-Git-Tag: omap-for-v3.11/fixes-for-merge-window~67^2~10^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12dd9752512449f0336b7d64df3871145a28a2fe;p=pandora-kernel.git

Merge tags 'renesas-pinmux-for-v3.11' and 'renesas-soc-for-v3.11' into cleanup

This merge has been performed in order to provide the pre-requisites for
a cleanup patch for the lager board to annotate various structures
with __initdata.

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

12dd9752512449f0336b7d64df3871145a28a2fe
Reading git-diff-tree failed