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

Merge branch 'upstream-fixes' into upstream
---

cea0d336e7e139becc9432499e0ba8234ffbed5f
Reading git-diff-tree failed