tree e5a79d920891e2f7ae8329207543ad9873092161
parent d96328055c8501f0ac4a6c343215fa8a2a140306
parent f920fe1cb74191a780d88937f36994231a8faba1
author Linus Torvalds <torvalds@linux-foundation.org> 1308930096 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1308930096 -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:
  pata_marvell: Add support for 88SE91A0, 88SE91A4
  libata/sas: only set FROZEN flag if new EH is supported
  libata: apply NOSETXFER horkage to the affected Pioneer drives regardless of firmware revision
  drivers/ata/sata_dwc_460ex: Fix typo 'corrresponding'