| commit | d3ead3a206effab210813eafff4bfaa581295252 | |
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | |
| Thu, 10 Jan 2008 22:53:37 +0000 (10 14:53 -0800) | ||
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | |
| Thu, 10 Jan 2008 22:53:37 +0000 (10 14:53 -0800) | ||
| tree | 0e2a7ffcb8321e5f1b6f25e5fd05e2891d4a66e2 | treesnapshot (tar.gz zip) |
| parent | 318851b08fb9d426a545f76e56f2cc049831fb40 | commitdiff |
| parent | 9b8e8de7e59b3a2dab3113d620b52dc8ba890fb3 | commitdiff |
Merge branch 'upstream-linus' of git://git./linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
libata and starting/stopping ATAPI floppy devices
sata_sil24: prevent hba lockup when pass-through ATA commands are used
Update kernel parameter document for libata DMA mode setting knobs.
libata: don't normalize UNKNOWN to NONE after reset
libata-pmp: propagate timeout to host link
libata-pmp: 4726 hates SRST
pata_ixp4xx_cf: fix compilation introduced by ata_port_desc() conversion
pata_pdc202xx_old: Further fixups
libata-sff: PCI IRQ handling fix
sata_qstor: use hardreset instead of softreset
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
libata and starting/stopping ATAPI floppy devices
sata_sil24: prevent hba lockup when pass-through ATA commands are used
Update kernel parameter document for libata DMA mode setting knobs.
libata: don't normalize UNKNOWN to NONE after reset
libata-pmp: propagate timeout to host link
libata-pmp: 4726 hates SRST
pata_ixp4xx_cf: fix compilation introduced by ata_port_desc() conversion
pata_pdc202xx_old: Further fixups
libata-sff: PCI IRQ handling fix
sata_qstor: use hardreset instead of softreset