| commit | ab1127823b757ec945a048c3385eb1f99a459823 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Mon Jan 22 11:30:47 2007 -0800 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Mon Jan 22 11:30:47 2007 -0800 |
| tree | 80bc28b5d6b4f1091f82da3d631200dd982b20b9 | |
| parent | 365bbe0d0caaf2ba74d56556827babf0bc66965d [diff] | |
| parent | e93f09dc2d49d8e98818a93ad17f3ede91533738 [diff] |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: sata_mv HighPoint 2310 support (88SX7042) libata: fix handling of port actions in per-dev action mask libata: initialize qc->dma_dir to DMA_NONE sata_via: add PCI ID 0x5337 libata doc: "error : unterminated entity reference exceptions"