From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 19 May 2014 00:28:48 +0000 (+1000)
Subject: Merge remote-tracking branch 'devicetree-current/devicetree/merge'
X-Git-Tag: next-20140519~117
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=aaa3c7e20e21e4dc0346af339ac90f6a4efe0997;p=karo-tx-linux.git

Merge remote-tracking branch 'devicetree-current/devicetree/merge'
---

aaa3c7e20e21e4dc0346af339ac90f6a4efe0997