Merge tag 'v3.4-rc6' into spi/next
authorGrant Likely <grant.likely@secretlab.ca>
Thu, 10 May 2012 00:32:01 +0000 (18:32 -0600)
committerGrant Likely <grant.likely@secretlab.ca>
Thu, 10 May 2012 00:32:01 +0000 (18:32 -0600)
Linux 3.4-rc6


Trivial merge