From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 3 Nov 2011 01:53:36 +0000 (+1100)
Subject: Merge remote-tracking branch 'devicetree-current/devicetree/merge'
X-Git-Tag: next-20111103~81
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=edec07135253e165bef7da3aa08a0388d7dbd8f3;p=karo-tx-linux.git

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

edec07135253e165bef7da3aa08a0388d7dbd8f3