From: Jeff Garzik <jeff@garzik.org>
Date: Tue, 22 Aug 2006 10:10:49 +0000 (-0400)
Subject: Merge branch 'upstream-fixes' into upstream
X-Git-Tag: v2.6.19-rc1~1262^2~25
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f89b2b5ddcace8959f760c0556369bd19bda0548;p=pandora-kernel.git

Merge branch 'upstream-fixes' into upstream

Conflicts:

	drivers/ata/ata_piix.c
---

f89b2b5ddcace8959f760c0556369bd19bda0548
Reading git-diff-tree failed