diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-30 10:07:44 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-30 10:07:44 -0800 |
| commit | ff20f1779b7f60a9682aa8d62f8ca3b650e4c360 (patch) | |
| tree | dc4ad4ef1365009e1dbb09baf2238db74132022c /drivers/staging/zram/zram_drv.c | |
| parent | memcg: fix wrong VM_BUG_ON() in try_charge()'s mm->owner check (diff) | |
| parent | spi/m68knommu: Coldfire QSPI platform support (diff) | |
| download | linux-dev-ff20f1779b7f60a9682aa8d62f8ca3b650e4c360.tar.xz linux-dev-ff20f1779b7f60a9682aa8d62f8ca3b650e4c360.zip | |
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 '')
0 files changed, 0 insertions, 0 deletions