Merge branch 'spi/next' of git://git.secretlab.ca/git/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Aug 2011 06:49:38 +0000 (20:49 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Aug 2011 06:49:38 +0000 (20:49 -1000)
commit73a9fe86fa21ccd528807b8cc871dc18be67ee5a
tree07b8295e89e8cacf29f74b23782a4f662259cad2
parentf3406816bb2486fc44558bec77179cd9bcbd4450
parent50658b6602dad6dc76c226917f5d8cec0f680eab
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