Merge commit 'v2.6.38-rc4' into spi/next
authorGrant Likely <grant.likely@secretlab.ca>
Mon, 14 Feb 2011 18:08:53 +0000 (11:08 -0700)
committerGrant Likely <grant.likely@secretlab.ca>
Mon, 14 Feb 2011 18:08:53 +0000 (11:08 -0700)

Trivial merge