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)
commit4741c336d27dec3ea68a35659abb8dc82b142388
treea8576df82129354b77b0144c480c446ec7aba7b2
parent26ec634c31a11a003040e10b4d650495158632fd
parenta9a5cd5d2a57fb76dbae2115450f777b69beccf7
Merge branch 'master'
drivers/scsi/Makefile
drivers/scsi/sata_mv.c