]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge branch 'upstream'
authorJeff Garzik <jeff@garzik.org>
Sat, 1 Apr 2006 19:29:12 +0000 (14:29 -0500)
committerJeff Garzik <jeff@garzik.org>
Sat, 1 Apr 2006 19:29:12 +0000 (14:29 -0500)
1  2 
drivers/scsi/libata-core.c
drivers/scsi/sata_mv.c
include/linux/libata.h

Simple merge
Simple merge
Simple merge