commit fc42dabe465d478311423039448d9dc9051e5f6b
author Linus Torvalds <torvalds@woody.linux-foundation.org> Thu Oct 25 15:20:22 2007 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Thu Oct 25 15:20:22 2007 -0700
tree e00cd6fa67cc49c2793879cbc61d4c3a16ff5ec1
parent 2304c3ac3634d2de59f71f7b2c58aab05959124b
parent e2e031eb09760c36099ac127eeb175e06d257aef

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:
  [libata] sata_nv: SWNCQ should not apply to MCP61
  libata-core: Be a bit more relaxed about early DMA zero devices
  ahci: ahci: implement workaround for ASUS P5W-DH Deluxe ahci_broken_hardreset(), take #2
  Fix pata_icside build for recent libata API changes
  libata: cosmetic clean up in ata_eh_reset()
  libata-core.c: make 2 functions static
  [libata] Create internal helper ata_dev_set_feature()