From: Jeff Garzik <jeff@garzik.org>
Date: Mon, 12 Jun 2006 03:04:37 +0000 (-0400)
Subject: Merge branch 'upstream-fixes' into upstream
X-Git-Tag: v2.6.18-rc1~1079^2~35
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fec69a97489f961026e24536dbb7b86ac663948c;p=pandora-kernel.git

Merge branch 'upstream-fixes' into upstream

Conflicts:

	drivers/scsi/sata_sil24.c
---

fec69a97489f961026e24536dbb7b86ac663948c
Reading git-diff-tree failed