tree 192d743da2ffbe6305a28b4571b5cefc78d6755a
parent 012abeea669ea49636cf952d13298bb68654146a
parent 159a7ff7a13f9a02c75006f40c0561a3a81aefcd
author Linus Torvalds <torvalds@linux-foundation.org> 1255710311 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1255710311 -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:
  sata_mv: Prevent PIO commands to be defered too long if traffic in progress.
  pata_sc1200: Fix crash on boot
  libata: fix internal command failure handling
  libata: fix PMP initialization
  sata_nv: make sure link is brough up online when skipping hardreset
  ahci / atiixp / pci quirks: rename AMD SB900 into Hudson-2
  ahci: Add the AHCI controller Linux Device ID for NVIDIA chipsets.
  pata_via: extend the rev_max for VT6330