From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 20 May 2014 01:11:41 +0000 (+1000)
Subject: Merge remote-tracking branch 'devicetree-current/devicetree/merge'
X-Git-Tag: next-20140520~120
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1ff912da16256a0f4a5e8b861173ba3aca245592;p=karo-tx-linux.git

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

1ff912da16256a0f4a5e8b861173ba3aca245592