]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Sat, 29 Oct 2005 01:32:01 +0000 (21:32 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Sat, 29 Oct 2005 01:32:01 +0000 (21:32 -0400)
1  2 
drivers/scsi/libata-scsi.c
drivers/scsi/pdc_adma.c

Simple merge
Simple merge