From: Jeff Garzik <jeff@garzik.org>
Date: Sat, 19 Aug 2006 21:51:34 +0000 (-0400)
Subject: Merge branch 'upstream-fixes' into upstream
X-Git-Tag: v2.6.19-rc1~1263^2~85
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1fb0a6c8c6fe08ae1a5c20f5bdb05a287df3b828;p=pandora-kernel.git

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

1fb0a6c8c6fe08ae1a5c20f5bdb05a287df3b828
Reading git-diff-tree failed