Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Fri, 18 Nov 2005 16:42:40 +0000 (11:42 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Fri, 18 Nov 2005 16:42:40 +0000 (11:42 -0500)
1  2 
drivers/scsi/libata-scsi.c

Simple merge