From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 12 Sep 2011 04:17:38 +0000 (+1000)
Subject: Merge remote-tracking branch 'devicetree/devicetree/next'
X-Git-Tag: next-20110912~22
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5d76614087a4958f731310e4b997b2920fd72ebe;p=karo-tx-linux.git

Merge remote-tracking branch 'devicetree/devicetree/next'

Conflicts:
	drivers/of/base.c
---

5d76614087a4958f731310e4b997b2920fd72ebe