From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 11 Apr 2011 22:44:38 +0000 (-0700)
Subject: Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6
X-Git-Tag: v2.6.39-rc3~4
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=6b98cd5aad3bb51a3b5b51ba670ab8d5fe1cc487;p=~shefty%2Frdma-dev.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:
  dt/fsldma: fix build warning caused by of_platform_device changes
  spi: Fix race condition in stop_queue()
  gpio/pch_gpio: Fix output value of pch_gpio_direction_output()
  gpio/ml_ioh_gpio: Fix output value of ioh_gpio_direction_output()
  gpio/pca953x: fix error handling path in probe() call
---

6b98cd5aad3bb51a3b5b51ba670ab8d5fe1cc487