Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 17 Feb 2011 00:48:36 +0000 (16:48 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 17 Feb 2011 00:48:36 +0000 (16:48 -0800)
commit68ac01a2de5faed5e19a78c06314804c6184a650
tree44bc9d9bb40f2781519c0f4f608f6456bdbc0db6
parente51900f7d38cbcfb481d84567fd92540e7e1d23a
parent0f3e1d27a7e3f98d996d707d649128e229b65deb
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