tree 2cbb38e7f31dc98d41a66427c7f85e248c232ed9
parent 108b42b4b966462444265806e3d7260a632ad630
parent be9a50c8524b53003e5fa32f072945772ffd13a5
author Linus Torvalds <torvalds@g5.osdl.org> 1143836881 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> 1143836881 -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: fix ata_xfer_tbl termination
  [PATCH] libata: make ata_qc_issue complete failed qcs
  [PATCH] libata: fix ata_qc_issue failure path
  [PATCH] ata_piix: fix ich6/m_map_db
  [libata] ahci: add ATI SB600 PCI IDs