Merge branch 'mv-merge'
authorJeff Garzik <jeff@garzik.org>
Thu, 30 Mar 2006 00:43:31 +0000 (19:43 -0500)
committerJeff Garzik <jeff@garzik.org>
Thu, 30 Mar 2006 00:43:31 +0000 (19:43 -0500)
commit55d8ca4f8094246da6e71889a4e04bfafaa78b10
treefd6a562c93363ea11952e818e16cd080fac8caba
parent00b6f5e9e04b2186a71a5892640bb2d8e09a030e
parent63af2a5c5990d95f1e7d8795f1425fb976ea2b4b
Merge branch 'mv-merge'

Conflicts:

drivers/scsi/sata_mv.c
drivers/scsi/sata_mv.c