From: Jeff Garzik <jeff@garzik.org>
Date: Sun, 28 May 2006 20:32:59 +0000 (-0400)
Subject: Merge branch 'upstream-fixes' into upstream
X-Git-Tag: v2.6.18-rc1~1079^2~74
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e42d7be25cf53548347bff8b8f43410704ea7bb0;p=pandora-kernel.git

Merge branch 'upstream-fixes' into upstream

Conflicts:

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

e42d7be25cf53548347bff8b8f43410704ea7bb0
Reading git-diff-tree failed