Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Tue, 3 Jan 2006 15:59:55 +0000 (10:59 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 3 Jan 2006 15:59:55 +0000 (10:59 -0500)
1  2 
drivers/scsi/libata-scsi.c

Simple merge