Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Sat, 5 Nov 2005 20:44:48 +0000 (15:44 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Sat, 5 Nov 2005 20:44:48 +0000 (15:44 -0500)
1  2 
drivers/scsi/libata-scsi.c

Simple merge