Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Tue, 6 Dec 2005 09:14:13 +0000 (04:14 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 6 Dec 2005 09:14:13 +0000 (04:14 -0500)
1  2 
drivers/scsi/libata-scsi.c

Simple merge