Merge branch 'upstream-fixes' into upstream
authorJeff Garzik <jeff@garzik.org>
Wed, 9 Aug 2006 05:19:18 +0000 (01:19 -0400)
committerJeff Garzik <jeff@garzik.org>
Wed, 9 Aug 2006 05:19:18 +0000 (01:19 -0400)
1  2 
drivers/scsi/libata-scsi.c

Simple merge