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

Merge branch 'tmp' into upstream

Conflicts:

	drivers/ata/libata-sff.c
---

a64f97f2c351410dfb3099c2369eacf7154b5532
Reading git-diff-tree failed