Merge branch 'upstream-fixes'
authorJeff Garzik <jgarzik@pobox.com>
Thu, 2 Feb 2006 21:17:31 +0000 (16:17 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Thu, 2 Feb 2006 21:17:31 +0000 (16:17 -0500)
commit9ac341ae799413708e674bc65c8a72c90dae8d34
treee4b4f21c424e1843ce2155f060e8930154b0476b
parent18ee3610040a4c008ce08a40a5dd025241cc7e97
parentddef9bb367b19383df627e388cb4c01c86ddba6c
Merge branch 'upstream-fixes'
drivers/scsi/sata_mv.c