Merge commit 'v3.1' into devicetree/next
authorGrant Likely <grant.likely@secretlab.ca>
Mon, 24 Oct 2011 15:03:35 +0000 (17:03 +0200)
committerGrant Likely <grant.likely@secretlab.ca>
Mon, 24 Oct 2011 15:03:35 +0000 (17:03 +0200)

Trivial merge