]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge commit 'v2.6.33-rc6' into secretlab/next-spi
authorGrant Likely <grant.likely@secretlab.ca>
Tue, 2 Feb 2010 08:05:22 +0000 (01:05 -0700)
committerGrant Likely <grant.likely@secretlab.ca>
Tue, 2 Feb 2010 08:05:22 +0000 (01:05 -0700)

Trivial merge