]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Tue, 18 Oct 2005 22:30:58 +0000 (18:30 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 18 Oct 2005 22:30:58 +0000 (18:30 -0400)
1  2 
drivers/scsi/libata-scsi.c
drivers/scsi/libata.h

Simple merge
Simple merge