Merge v2.6.37-rc8 into powerpc/next
authorGrant Likely <grant.likely@secretlab.ca>
Thu, 30 Dec 2010 05:20:30 +0000 (22:20 -0700)
committerGrant Likely <grant.likely@secretlab.ca>
Thu, 30 Dec 2010 05:21:47 +0000 (22:21 -0700)

Trivial merge