From: Jeff Garzik <jeff@garzik.org>
Date: Wed, 24 May 2006 05:49:12 +0000 (-0400)
Subject: Merge branch 'upstream-fixes' into upstream
X-Git-Tag: v2.6.18-rc1~1079^2~87
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c81e29b4aca2b2503238276219d97faaac994b4f;p=pandora-kernel.git

Merge branch 'upstream-fixes' into upstream

Conflicts:

	drivers/scsi/libata-core.c
---

c81e29b4aca2b2503238276219d97faaac994b4f
Reading git-diff-tree failed