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

Merge branch 'upstream-fixes' into upstream

Conflicts:

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

3d71b3b0b634b1a5ba8632fd9ec998e0e4aedfdb
Reading git-diff-tree failed