From: Grant Likely <grant.likely@secretlab.ca>
Date: Fri, 14 Jan 2011 19:09:49 +0000 (-0700)
Subject: Merge branch 'devicetree/next' into spi/next
X-Git-Tag: v2.6.38-rc1~43^2~1
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=42a9fa9957e369240936891c9a521ab671eed4e7;p=users%2Fhch%2Fuuid.git

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

42a9fa9957e369240936891c9a521ab671eed4e7