Merge branch 'spi/next' of git://git.secretlab.ca/git/linux-2.6
Linus Torvalds [Wed, 3 Aug 2011 06:49:38 +0000 (20:49 -1000)]
* 'spi/next' of git://git.secretlab.ca/git/linux-2.6:
  spi/pl022: remove function cannot exit


Trivial merge