| commit | ff20f1779b7f60a9682aa8d62f8ca3b650e4c360 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Dec 30 10:07:44 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Dec 30 10:07:44 2010 -0800 |
| tree | dc4ad4ef1365009e1dbb09baf2238db74132022c | |
| parent | ebb76ce16daf6908dc030dec1c00827d37129fe5 [diff] | |
| parent | 0bc463426ab5eb39e76df637b29a4f191d01b8a0 [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: spi/m68knommu: Coldfire QSPI platform support spi/omap2_mcspi.c: Force CS to be in inactive state after off-mode transition