From: Simon Horman <horms+renesas@verge.net.au>
Date: Fri, 7 Jun 2013 05:26:22 +0000 (+0900)
Subject: Merge branches 'pinmux' and 'soc' into boards-base
X-Git-Tag: omap-for-v3.11/fixes-for-merge-window~70^2~9^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a961ee1c95cb7309f619e9e68fe8c4fb73bedf6f;p=pandora-kernel.git

Merge branches 'pinmux' and 'soc' into boards-base

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

a961ee1c95cb7309f619e9e68fe8c4fb73bedf6f
Reading git-diff-tree failed