Merge branch 'upstream'
authorJeff Garzik <jeff@garzik.org>
Tue, 4 Apr 2006 12:45:13 +0000 (08:45 -0400)
committerJeff Garzik <jeff@garzik.org>
Tue, 4 Apr 2006 12:45:13 +0000 (08:45 -0400)
1  2 
drivers/scsi/libata-core.c
include/linux/libata.h

Simple merge
Simple merge