diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-30 18:07:44 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-30 18:07:44 (GMT) |
| commit | ff20f1779b7f60a9682aa8d62f8ca3b650e4c360 (patch) | |
| tree | dc4ad4ef1365009e1dbb09baf2238db74132022c /drivers/staging/zram | |
| parent | ebb76ce16daf6908dc030dec1c00827d37129fe5 (diff) | |
| parent | 0bc463426ab5eb39e76df637b29a4f191d01b8a0 (diff) | |
| download | linux-fsl-qoriq-ff20f1779b7f60a9682aa8d62f8ca3b650e4c360.tar.xz | |
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
Diffstat (limited to 'drivers/staging/zram')
0 files changed, 0 insertions, 0 deletions