From: Linus Torvalds 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-Tag: firefly_0821_release~36451 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d21c356b08820e60501ce7a42107a7f05863d91d;p=firefly-linux-kernel-4.4.55.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