diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 09:16:07 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 09:16:07 -0800 |
| commit | 2fd8507d14ef7af3ae05316b3277044cf6daa381 (patch) | |
| tree | 8dc061d6c983f9be9a75109b2caef373cd7dfd80 /kernel | |
| parent | 1c1afa3c053d4ccdf44e5a4e159005cdfd48bfc6 (diff) | |
| parent | fd3367af3d1212f645094c4b5c4d458bdd061475 (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:
[PATCH] libata: Incorrect timing computation for PIO5/6
[PATCH] sata_promise: new EH conversion, take 2
[PATCH] libata: let ATA_FLAG_PIO_POLLING use polling pio for ATA_PROT_NODATA
[PATCH] sata_promise: cleanups, take 2
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions