From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 17 Feb 2011 00:48:36 +0000 (-0800)
Subject: Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6
X-Git-Url: https://git.karo-electronics.de/?p=mv-sheeva.git;a=commitdiff_plain;h=68ac01a2de5faed5e19a78c06314804c6184a650

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/pxa2xx pci: fix the release - remove race
---

68ac01a2de5faed5e19a78c06314804c6184a650