From: Simon Horman <horms+renesas@verge.net.au>
Date: Thu, 19 Dec 2013 08:14:25 +0000 (+0900)
Subject: Merge tag 'v3.13-rc3' into dt3-base
X-Git-Tag: dt-for-linus~7^2~23
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=236573d2405d6b9fa5395d14731c2ec2f8cb8f4f;p=pandora-kernel.git

Merge tag 'v3.13-rc3' into dt3-base

Linux 3.13-rc3

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

236573d2405d6b9fa5395d14731c2ec2f8cb8f4f
Reading git-diff-tree failed