Merge branch 'master'
authorJeff Garzik <jeff@garzik.org>
Tue, 18 Apr 2006 08:54:00 +0000 (04:54 -0400)
committerJeff Garzik <jeff@garzik.org>
Tue, 18 Apr 2006 08:54:00 +0000 (04:54 -0400)
1  2 
drivers/scsi/Makefile
drivers/scsi/sata_mv.c

Simple merge
Simple merge