| commit | 4d3fac08718b49fc256bdb447a479d089ca97b78 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Wed Sep 26 08:57:27 2007 -0700 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Wed Sep 26 08:57:27 2007 -0700 |
| tree | 01bb670864df83f891c2b2a8eb576ad5c4b0bbe4 | |
| parent | 1f23f4209f2b99fdddf09821eead6364a6dd9654 [diff] | |
| parent | edeb614c1c8388b354d93ff7790317cc5d6a38ec [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: pata_sis: add missing UDMA5 timing value in sis_66_set_dmamode() sata_sil24: fix IRQ clearing race when PCIX_IRQ_WOC is used