From: Grant Likely <grant.likely@secretlab.ca>
Date: Mon, 21 May 2012 02:18:37 +0000 (-0600)
Subject: Merge branch 'devicetree/merge' into devicetree/next
X-Git-Tag: for-linus-20120531~69^2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=8d6c1efa51236bb781f202aa13b9f4ba654978c6;p=linux-block.git

Merge branch 'devicetree/merge' into devicetree/next
---

8d6c1efa51236bb781f202aa13b9f4ba654978c6