From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 7 Nov 2012 23:59:15 +0000 (+1100)
Subject: Merge remote-tracking branch 'devicetree-current/devicetree/merge'
X-Git-Tag: next-20121108~115
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e788401b04073fe0a3ffe1e366a9448418e08570;p=karo-tx-linux.git

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

e788401b04073fe0a3ffe1e366a9448418e08570