tree 6f54fa70f43f747c7776e62afd3abeac20f1a82b
parent 638944adc169b3164399a7c1aa98bb48fa070e41
parent c7843e8f565f624b0cff7cad1370fad4cb84dfbc
author Linus Torvalds <torvalds@linux-foundation.org> 1215190374 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1215190374 -0700

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