Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@woody.osdl.org>
Wed, 29 Nov 2006 04:54:40 +0000 (20:54 -0800)
committerLinus Torvalds <torvalds@woody.osdl.org>
Wed, 29 Nov 2006 04:54:40 +0000 (20:54 -0800)
commit4f404caf6791227754d67679d0b2350afc1ad522
tree326864739adbeb3101a2965cb1688dfabd065b7d
parent691ce26e4066147ab75366307c5c65d26c7fd805
parent08475a1920aa7acc535324d6991b830fa7625bd8
Merge branch 'upstream-linus' of /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