diff options
| author |   Jeff Garzik <jeff@garzik.org> | 2006-05-24 01:49:12 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-05-24 01:49:12 -0400 |
| commit | c81e29b4aca2b2503238276219d97faaac994b4f (patch) | |
| tree | 02ec800bd9e2625b89757e2ba59f3b3c0f7c1236 /include/linux | |
| parent | [libata sata_promise] Add PATA cable detection. (diff) | |
| parent | [PATCH] libata: add pio flush for via atapi (was: Re: TR: ASUS A8V Deluxe, x86_64) (diff) | |
Merge branch 'upstream-fixes' into upstream
Conflicts:
drivers/scsi/libata-core.c
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions