tree c38970f362c4de594a7433de5989cae0a199d199
parent b42282e5a05018ecdc0d63a4ad530b0999785912
parent 8faa7cf828bca1745a4ed599876567f5afc47544
author Linus Torvalds <torvalds@linux-foundation.org> 1302561878 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1302561878 -0700

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