]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Sun, 30 Oct 2005 06:59:10 +0000 (01:59 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Sun, 30 Oct 2005 06:59:10 +0000 (01:59 -0500)
1  2 
drivers/scsi/libata-scsi.c

Simple merge