From: Jeff Garzik <jeff@garzik.org>
Date: Sat, 11 Mar 2006 18:35:31 +0000 (-0500)
Subject: Merge branch 'upstream-fixes'
X-Git-Tag: v2.6.17-rc1~1186^2~10
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=749dfc70554f2c9e6624ac843d66571265ed9338;p=pandora-kernel.git

Merge branch 'upstream-fixes'
---

749dfc70554f2c9e6624ac843d66571265ed9338
Reading git-diff-tree failed