commit b5625481832ef1ab1a8e31fac0b1d14acdbbc148
author Linus Torvalds <torvalds@woody.linux-foundation.org> Wed Aug 01 20:47:00 2007 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Wed Aug 01 20:47:00 2007 -0700
tree 5ff272c95b810a1d8cd3f09f486600c4d6b9357a
parent 0fc4969b866671dfe39b1a9119d0fdc7ea0f63e5
parent 4761c06cb39011c9cc3fef9e6bbfb4c50ceb307d

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: fix MWDMA for <= UDMA66 chipsets and UDMA for UDMA33 chipsets
  libata: blacklist SAMSUNG HD401LJ / ZZ100-15 for NCQ
  ata_piix: add Tecra M3 to broken suspend blacklist
  ata_piix: implement piix_borken_suspend()
  pci: rename __pci_reenable_device() to pci_reenable_device()
  libata-sff; Unbreak non DMA capable controllers again
  pata_cmd64x: Correct the speed ranges