]> err.no Git - linux-2.6/commitdiff
Merge branch 'scsi-scan'
authorJeff Garzik <jgarzik@pobox.com>
Tue, 4 Oct 2005 18:24:04 +0000 (14:24 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 4 Oct 2005 18:24:04 +0000 (14:24 -0400)
1  2 
drivers/scsi/libata-core.c
drivers/scsi/libata-scsi.c

Simple merge
Simple merge