| commit | d02bf062fbb5e714d84ecefd05106062b9a45159 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat May 28 10:57:39 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat May 28 10:57:39 2011 -0700 |
| tree | dde6fa5fe051bb147b7d62261ac204f5a371cb3c | |
| parent | 04830fccdcafa7e0ea913990ae56437253553fef [diff] | |
| parent | 9c3e737561b2473ea1fc5b83a0c1d51e1ff3d294 [diff] |
Merge branch 'spi/next' of git://git.secretlab.ca/git/linux-2.6 * 'spi/next' of git://git.secretlab.ca/git/linux-2.6: spi/spi_bfin_sport: new driver for a SPI bus via the Blackfin SPORT peripheral spi/tle620x: add missing device_remove_file()