tree 89b0a788bc19e668cd12feb5f6495260896d9da2
parent acb11bcdbde29cfedaaedfea314b922b99274907
parent e3f88ae9960920598cad132c553019ee79ff3aca
author Linus Torvalds <torvalds@linux-foundation.org> 1307986411 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1307986411 -0700

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