From: Jeff Garzik <jeff@garzik.org>
Date: Thu, 30 Mar 2006 00:43:31 +0000 (-0500)
Subject: Merge branch 'mv-merge'
X-Git-Tag: v2.6.17-rc1~146^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55d8ca4f8094246da6e71889a4e04bfafaa78b10;p=pandora-kernel.git

Merge branch 'mv-merge'

Conflicts:

	drivers/scsi/sata_mv.c
---

55d8ca4f8094246da6e71889a4e04bfafaa78b10
Reading git-diff-tree failed