commit 562aa1d4c6a874373f9a48ac184f662fbbb06a04
author Linus Torvalds <torvalds@woody.linux-foundation.org> Thu Mar 01 19:48:21 2007 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Thu Mar 01 19:48:21 2007 -0800
tree ad4d9c19f7a98bb4f35b35104ffecb5723f686c8
parent b4350861dd6d5668bb9fe18eec4227d30e9131b0
parent afb2d552bc4c241c009f5947311a95de426a75d9

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:
  ahci: improve spurious SDB FIS handling
  ahci/pata_jmicron: match class not function number
  jmicron ATA: reimplement jmicron ATA quirk
  pata_jmicron: drop unnecessary device programming in [re]init
  libata: blacklist FUJITSU MHT2060BH for NCQ
  sata_sil24: kill unused local variable idx in sil24_fill_sg()
  libata: clear drvdata in ata_host_release(), take#2