From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 13 Jun 2011 17:33:31 +0000 (-0700)
Subject: Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6
X-Git-Tag: v3.0-rc3~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=562d1ffed2082fc59fb72173b856822ffe781559;p=profile%2Fivi%2Fkernel-x86-ivi.git

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

562d1ffed2082fc59fb72173b856822ffe781559