Merge commit 'v2.6.38-rc3' into devicetree/next
authorGrant Likely <grant.likely@secretlab.ca>
Fri, 4 Feb 2011 18:46:43 +0000 (11:46 -0700)
committerGrant Likely <grant.likely@secretlab.ca>
Fri, 4 Feb 2011 18:46:43 +0000 (11:46 -0700)

Trivial merge