From: Simon Horman <horms+renesas@verge.net.au>
Date: Tue, 2 Apr 2013 02:08:34 +0000 (+0900)
Subject: Merge branch 'soc' into pinmux-base
X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~9^2~9^2~28
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=809609a5d8427b0025304dbb69a84a692d11c4f9;p=pandora-kernel.git

Merge branch 'soc' into pinmux-base

Conflicts:
	drivers/pinctrl/sh-pfc/pfc-r8a7740.c

This merge is to provide r8a73a4 SoC files, which are added in the
soc branch and depended on by r8a73a4 pfc-changes which are to
be added to the pinmux branch.
---

809609a5d8427b0025304dbb69a84a692d11c4f9
Reading git-diff-tree failed