From: Jeff Garzik <jeff@garzik.org>
Date: Thu, 30 Mar 2006 00:59:39 +0000 (-0500)
Subject: Merge branch 'upstream'
X-Git-Tag: v2.6.18-rc1~1079^2~98^2~13^2~15
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f0e7c51ae392d841be395a9c6b8d26a9fbf33d2;p=pandora-kernel.git

Merge branch 'upstream'

Conflicts:

	drivers/scsi/sata_mv.c
---

4f0e7c51ae392d841be395a9c6b8d26a9fbf33d2
Reading git-diff-tree failed