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

* 'spi/next' of git://git.secretlab.ca/git/linux-2.6:
  spi/pl022: remove function cannot exit
This commit is contained in:
Linus Torvalds 2011-08-02 20:49:38 -10:00
commit 73a9fe86fa