Automatic merge of /spare/repo/netdev-2.6 branch use-after-unmap

author <jgarzik@pretzel.yyz.us> <>

Sun, 29 May 2005 18:24:57 +0000 (14:24 -0400)

committer Jeff Garzik <jgarzik@pobox.com>

Sun, 29 May 2005 18:24:57 +0000 (14:24 -0400)
author <jgarzik@pretzel.yyz.us> <>
Sun, 29 May 2005 18:24:57 +0000 (14:24 -0400)
committer Jeff Garzik <jgarzik@pobox.com>
Sun, 29 May 2005 18:24:57 +0000 (14:24 -0400)
diff --cc drivers/scsi/ahci.c
Simple merge
diff --cc drivers/scsi/libata-core.c
Simple merge
diff --cc drivers/scsi/sata_vsc.c
Simple merge
author	<jgarzik@pretzel.yyz.us> <>
	Sun, 29 May 2005 18:24:57 +0000 (14:24 -0400)
committer	Jeff Garzik <jgarzik@pobox.com>
	Sun, 29 May 2005 18:24:57 +0000 (14:24 -0400)
		1	2
drivers/scsi/ahci.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/scsi/libata-core.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/scsi/sata_vsc.c	patch \|	diff1 \|	diff2 \|	blob \| history