| commit | 989cd445b48dc996426ab739d002ed504c5c43c9 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Oct 04 11:13:22 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Oct 04 11:13:22 2010 -0700 |
| tree | d00443db16f53b6eb329aaf3eb2fb843d1a14018 | |
| parent | 4a73a43741489a652588460e72be959e60bcb9ec [diff] | |
| parent | 2b7a32f7ecb24d01bd0b2d5097d7c7ebe7082ba7 [diff] |
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