Merge commit 'v2.6.37-rc7' into spi/next
authorGrant Likely <grant.likely@secretlab.ca>
Wed, 22 Dec 2010 07:10:01 +0000 (00:10 -0700)
committerGrant Likely <grant.likely@secretlab.ca>
Wed, 22 Dec 2010 07:10:01 +0000 (00:10 -0700)

Trivial merge