Merge branch 'devicetree/next' into spi/next
authorGrant Likely <grant.likely@secretlab.ca>
Fri, 14 Jan 2011 19:09:49 +0000 (12:09 -0700)
committerGrant Likely <grant.likely@secretlab.ca>
Fri, 14 Jan 2011 19:09:49 +0000 (12:09 -0700)

Trivial merge