]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Mon, 31 Oct 2005 04:32:03 +0000 (23:32 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Mon, 31 Oct 2005 04:32:03 +0000 (23:32 -0500)
1  2 
drivers/scsi/libata-core.c
drivers/scsi/libata-scsi.c

Simple merge
Simple merge