From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 3 Aug 2011 06:49:38 +0000 (-1000)
Subject: Merge branch 'spi/next' of git://git.secretlab.ca/git/linux-2.6
X-Git-Tag: v3.1-rc1~84
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=73a9fe86fa21ccd528807b8cc871dc18be67ee5a;p=linux.git

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
---

73a9fe86fa21ccd528807b8cc871dc18be67ee5a