Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Sat, 12 Nov 2005 04:38:52 +0000 (23:38 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Sat, 12 Nov 2005 04:38:52 +0000 (23:38 -0500)
1  2 
drivers/scsi/libata-scsi.c

Simple merge