From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 29 May 2014 23:50:30 +0000 (+1000)
Subject: Merge remote-tracking branch 'renesas/next'
X-Git-Tag: next-20140530~114
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3b7f09193314ef08a928e74dbe7805c93df3c80e;p=karo-tx-linux.git

Merge remote-tracking branch 'renesas/next'

Conflicts:
	arch/arm/boot/dts/Makefile
---

3b7f09193314ef08a928e74dbe7805c93df3c80e