From: Jeff Garzik <jeff@garzik.org>
Date: Fri, 24 Mar 2006 14:24:04 +0000 (-0500)
Subject: Merge branch 'upstream'
X-Git-Tag: v2.6.18-rc1~1079^2~98^2~13^2~32
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11ed56fb7899f9eb9eaef8e5919db1bf08f1b07e;p=pandora-kernel.git

Merge branch 'upstream'

Conflicts:

	drivers/scsi/sata_vsc.c
---

11ed56fb7899f9eb9eaef8e5919db1bf08f1b07e
Reading git-diff-tree failed