From: Jeff Garzik <jeff@garzik.org>
Date: Mon, 11 Sep 2006 12:54:55 +0000 (-0400)
Subject: Merge branch 'upstream-fixes' into upstream
X-Git-Tag: v2.6.19-rc1~1262^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd1dc802368154a75926491092ec9e6a939c32df;p=pandora-kernel.git

Merge branch 'upstream-fixes' into upstream

Conflicts:

	drivers/ata/ata_piix.c
---

dd1dc802368154a75926491092ec9e6a939c32df
Reading git-diff-tree failed