]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge branch 'upstream'
authorJeff Garzik <jeff@garzik.org>
Wed, 12 Apr 2006 20:54:16 +0000 (16:54 -0400)
committerJeff Garzik <jeff@garzik.org>
Wed, 12 Apr 2006 20:54:16 +0000 (16:54 -0400)
1  2 
drivers/scsi/libata-scsi.c
include/linux/libata.h

Simple merge
Simple merge