tree d00443db16f53b6eb329aaf3eb2fb843d1a14018
parent 4a73a43741489a652588460e72be959e60bcb9ec
parent 2b7a32f7ecb24d01bd0b2d5097d7c7ebe7082ba7
author Linus Torvalds <torvalds@linux-foundation.org> 1286216002 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1286216002 -0700

Merge branch 'merge-spi' of git://git.secretlab.ca/git/linux-2.6

* 'merge-spi' of git://git.secretlab.ca/git/linux-2.6:
  of/spi: Fix OF-style driver binding of spi devices
  spi: spi-gpio.c tests SPI_MASTER_NO_RX bit twice, but not SPI_MASTER_NO_TX
  spi/mpc8xxx: fix buffer overrun on large transfers