Merge branch 'spi' of git://gitorious.org/linus-tree/linus-tree into spi/next
authorGrant Likely <grant.likely@secretlab.ca>
Tue, 10 Apr 2012 20:09:52 +0000 (14:09 -0600)
committerGrant Likely <grant.likely@secretlab.ca>
Tue, 10 Apr 2012 20:09:56 +0000 (14:09 -0600)

Trivial merge