]> err.no Git - linux-2.6/commitdiff
Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Sat, 29 Oct 2005 21:49:12 +0000 (17:49 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Sat, 29 Oct 2005 21:49:12 +0000 (17:49 -0400)
1  2 
drivers/scsi/libata-core.c
drivers/scsi/pdc_adma.c
drivers/scsi/sata_qstor.c
drivers/scsi/sata_sil24.c

Simple merge
Simple merge
Simple merge
Simple merge