| commit | a926c063738f31c8c8b5c2b883812a40e7868072 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jul 04 09:52:54 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jul 04 09:52:54 2008 -0700 |
| tree | 6f54fa70f43f747c7776e62afd3abeac20f1a82b | |
| parent | 638944adc169b3164399a7c1aa98bb48fa070e41 [diff] | |
| parent | c7843e8f565f624b0cff7cad1370fad4cb84dfbc [diff] |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: sata_mv: safer logic for limit_warnings libata-sff: improve HSM violation reporting ahci: always clear all bits in irq_stat sata_sil24: add DID for another adaptec flavor sata_uli: hardreset is broken