tree 326864739adbeb3101a2965cb1688dfabd065b7d
parent 691ce26e4066147ab75366307c5c65d26c7fd805
parent 08475a1920aa7acc535324d6991b830fa7625bd8
author Linus Torvalds <torvalds@woody.osdl.org> 1164776080 -0800
committer Linus Torvalds <torvalds@woody.osdl.org> 1164776080 -0800

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:
  [PATCH] libata: Fixup ata_sas_queuecmd to handle __ata_scsi_queuecmd failure
  [PATCH] ahci: AHCI mode SATA patch for Intel ICH9
  [PATCH] libata: don't schedule EH on wcache on/off if old EH