tree 2cfe7bf556562a846ff46a558a31ca1939d2e12c
parent da8e5aa21e037be02e0752e80b9444ff60185a3f
parent ab6fc95f609b372a19e18ea689986846ab1ba29c
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1193685114 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1193685114 -0700

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:
  [libata] AHCI: fix newly introduced host-reset bug
  [libata] sata_nv: fix SWNCQ enabling
  libata: add MAXTOR 7V300F0/VA111900 to NCQ blacklist
  libata: no need to speed down if already at PIO0
  libata: relocate forcing PIO0 on reset
  pata_ns87415: define SUPERIO_IDE_MAX_RETRIES
  [libata] Address some checkpatch-spotted issues
  [libata] fix 'if(' and similar areas that lack whitespace
  libata: implement ata_wait_after_reset()
  libata: track SLEEP state and issue SRST to wake it up
  libata: relocate and fix post-command processing