Merge commit 'v2.6.33-rc5' into secretlab/test-devicetree
authorGrant Likely <grant.likely@secretlab.ca>
Thu, 28 Jan 2010 21:38:25 +0000 (14:38 -0700)
committerGrant Likely <grant.likely@secretlab.ca>
Thu, 28 Jan 2010 21:38:25 +0000 (14:38 -0700)

Trivial merge