From: Linus Torvalds Date: Thu, 2 Nov 2006 03:16:31 +0000 (-0800) Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=aefba081d7b7dfd1c5752f6e6e709d8b5ab80ab7;p=linux-beck.git 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: Revert "[PATCH] Add 0x7110 piix to ata_piix.c" [libata] sata_nv: Add PCI IDs [PATCH] ahci: fix status register check in ahci_softreset --- aefba081d7b7dfd1c5752f6e6e709d8b5ab80ab7