From: Jeff Garzik <jeff@garzik.org>
Date: Sat, 29 Jul 2006 04:32:42 +0000 (-0400)
Subject: Merge branch 'upstream-fixes' into upstream
X-Git-Tag: v2.6.19-rc1~1263^2~118
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a47e9209485243afb4f002b8c3d76d1990b09d0a;p=pandora-kernel.git

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

a47e9209485243afb4f002b8c3d76d1990b09d0a
Reading git-diff-tree failed