commit e228c1b51ef572843827630e643a682ef492b933
author Linus Torvalds <torvalds@linux-foundation.org> Mon Sep 08 15:46:56 2008 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Mon Sep 08 15:46:56 2008 -0700
tree 77360b4dadfbe2c33b8c7ef594a4f9494d00f858
parent a46add72f79bb8196f07a860adddd312ca398eec
parent 8e48b6b307085ce8a747cf94294742f7b7a11b18

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:
  ahci: RAID mode SATA patch for Intel Ibex Peak DeviceIDs
  pata_sil680: remove duplicate pcim_enable_device
  libata-sff: kill spurious WARN_ON() in ata_hsm_move()
  sata_nv: disable hardreset for generic
  ahci: disable PMP for marvell ahcis
  sata_mv: add RocketRaid 1720 PCI ID to driver
  ahci, pata_marvell: play nicely together