| commit | 90ae83f7fc32733e5829d806306c0c590f1a383f | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Nov 01 07:50:43 2010 -0400 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Nov 01 07:50:43 2010 -0400 |
| tree | 5b4cd7290c70d9899ca7caa99998395218b15cab | |
| parent | 47c5ba53bc5e5f88b5d1bbb97acd25afc27f74eb [diff] | |
| parent | 65289d6345d93abd860e43fd2119ac176d6cc697 [diff] |
Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6 * 'next-spi' of git://git.secretlab.ca/git/linux-2.6: spi/pl022: fix erroneous platform data in U300 spi: fixed odd static string conventions in core code spi/bfin_spi: only request GPIO on first load spi/bfin_spi: handle error/status changes after data interrupts spi: enable spi_board_info to be registered after spi_master