Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6

* 'spi/merge' of git://git.secretlab.ca/git/linux-2.6:
  spi-pl022: Add missing return value update
This commit is contained in:
Linus Torvalds 2011-06-13 10:33:31 -07:00
commit 562d1ffed2