Merge branch 'for-spi' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackf...
authorGrant Likely <grant.likely@secretlab.ca>
Mon, 18 Oct 2010 15:25:09 +0000 (09:25 -0600)
committerGrant Likely <grant.likely@secretlab.ca>
Mon, 18 Oct 2010 15:25:09 +0000 (09:25 -0600)

Trivial merge