]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge branch 'upstream'
authorJeff Garzik <jeff@garzik.org>
Thu, 30 Mar 2006 00:58:22 +0000 (19:58 -0500)
committerJeff Garzik <jeff@garzik.org>
Thu, 30 Mar 2006 00:58:22 +0000 (19:58 -0500)
1  2 
drivers/scsi/libata-scsi.c
include/linux/libata.h

Simple merge
Simple merge