From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 31 Mar 2006 20:28:01 +0000 (-0800)
Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d21c356b08820e60501ce7a42107a7f05863d91d;p=openwrt%2Fstaging%2Fblogic.git

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: 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
---

d21c356b08820e60501ce7a42107a7f05863d91d