From: Linus Torvalds Date: Wed, 1 Nov 2006 05:17:23 +0000 (-0800) Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... X-Git-Tag: v2.6.19-rc5~76 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=30574b61611ccd29677989097f8c8a5d9a73d873;p=karo-tx-linux.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: [PATCH] ata_piix: allow 01b MAP for both ICH6M and ICH7M [PATCH] libata: unexport ata_dev_revalidate() [PATCH] Add 0x7110 piix to ata_piix.c [PATCH] sata_sis: fix flags handling for the secondary port --- 30574b61611ccd29677989097f8c8a5d9a73d873