From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 19 Sep 2013 02:59:20 +0000 (+1000)
Subject: Merge remote-tracking branch 'renesas/next'
X-Git-Tag: next-20130919~6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=745369bee3a8a3a1033d430df64cf0f45abd5dcf;p=karo-tx-linux.git

Merge remote-tracking branch 'renesas/next'

Conflicts:
	arch/arm/boot/dts/r8a73a4.dtsi
	arch/arm/boot/dts/r8a7790.dtsi
---

745369bee3a8a3a1033d430df64cf0f45abd5dcf