From: Linus Torvalds Date: Tue, 20 Mar 2007 03:12:25 +0000 (-0700) Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... X-Git-Tag: v2.6.21-rc5~53 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8718d75ef23e858a6b947f5b1a43094acf3b6e23;p=linux-2.6-omap-h63xx.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: pata_ixp4xx_cf: fix interrupt pata_ixp4xx_cf: fix oops on detach libata: kernel-doc fix sata_inic162x: kill double region requests drivers/ata/Kconfig: PATA_SCC depends on wrong platform sata_sil24: Add Adaptec 1220SA PCI ID libata: don't whine if ->prereset() returns -ENOENT --- 8718d75ef23e858a6b947f5b1a43094acf3b6e23