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

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

54a86bfc3d4601be9c36cd4e8a1bdc580c98fa6a
Reading git-diff-tree failed