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

diff --cc drivers/spi/amba-pl022.c
Simple merge

diff --cc drivers/spi/dw_spi.c
Simple merge

diff --cc drivers/spi/pxa2xx_spi.c
Simple merge

diff --cc drivers/spi/spi_bfin5xx.c
Simple merge