Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 13 Jun 2011 17:33:31 +0000 (10:33 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 13 Jun 2011 17:33:31 +0000 (10:33 -0700)
commit562d1ffed2082fc59fb72173b856822ffe781559
tree89b0a788bc19e668cd12feb5f6495260896d9da2
parentacb11bcdbde29cfedaaedfea314b922b99274907
parente3f88ae9960920598cad132c553019ee79ff3aca
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