Merge branch 'upstream'

author Jeff Garzik <[email protected]>

Wed, 12 Apr 2006 20:54:16 +0000 (16:54 -0400)

committer Jeff Garzik <[email protected]>

Wed, 12 Apr 2006 20:54:16 +0000 (16:54 -0400)
author Jeff Garzik <[email protected]>
Wed, 12 Apr 2006 20:54:16 +0000 (16:54 -0400)
committer Jeff Garzik <[email protected]>
Wed, 12 Apr 2006 20:54:16 +0000 (16:54 -0400)
diff --cc drivers/scsi/libata-scsi.c
Simple merge
diff --cc include/linux/libata.h
Simple merge
author	Jeff Garzik <[email protected]>
	Wed, 12 Apr 2006 20:54:16 +0000 (16:54 -0400)
committer	Jeff Garzik <[email protected]>
	Wed, 12 Apr 2006 20:54:16 +0000 (16:54 -0400)
		1	2
drivers/scsi/libata-scsi.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/libata.h	patch \|	diff1 \|	diff2 \|	blob \| history