Merge branch 'devicetree/merge' into devicetree/next
authorGrant Likely <grant.likely@secretlab.ca>
Mon, 21 May 2012 02:18:37 +0000 (20:18 -0600)
committerGrant Likely <grant.likely@secretlab.ca>
Mon, 21 May 2012 02:18:37 +0000 (20:18 -0600)

Trivial merge