From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 30 Oct 2012 23:32:21 +0000 (+1100)
Subject: Merge remote-tracking branch 'devicetree-current/devicetree/merge'
X-Git-Tag: next-20121031~107
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7775f92d832fff5ef50553601c52af6e0ed1acb7;p=karo-tx-linux.git

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

7775f92d832fff5ef50553601c52af6e0ed1acb7