commit df423dc7f2a801b9a45d7c501a8eb5c529455ea1
author Linus Torvalds <torvalds@linux-foundation.org> Thu Sep 09 20:28:19 2010 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Thu Sep 09 20:28:19 2010 -0700
tree bdb67fe58d91b88d1f71b556389857287d4e9a93
parent eee743fd7eac9f2ea69ad06d093dfb5a12538fe5
parent ea3c64506ea7965f86f030155e6fdef381de10e2

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-sff: Reenable Port Multiplier after libata-sff remodeling.
  libata: skip EH autopsy and recovery during suspend
  ahci: AHCI and RAID mode SATA patch for Intel Patsburg DeviceIDs
  ata_piix: IDE Mode SATA patch for Intel Patsburg DeviceIDs
  libata,pata_via: revert ata_wait_idle() removal from ata_sff/via_tf_load()
  ahci: fix hang on failed softreset
  pata_artop: Fix device ID parity check