]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitb1c0719de8f15b147282084d3698be9da7900b7a
treefd6a562c93363ea11952e818e16cd080fac8caba
parent243f286f6ad401e6669283f63795d5b1266c39f6
parent8d1a67db3245d48f96142ca1a07d976fd95621a1
Merge branch 'mv-merge'

Conflicts:

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