]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Thu, 2 Feb 2006 06:12:54 +0000 (01:12 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Thu, 2 Feb 2006 06:12:54 +0000 (01:12 -0500)
1  2 
drivers/scsi/libata-scsi.c
drivers/scsi/scsi_error.c

Simple merge
Simple merge