From: Jeff Garzik <jgarzik@pobox.com>
Date: Tue, 13 Dec 2005 07:30:04 +0000 (-0500)
Subject: Merge branch 'upstream-fixes'
X-Git-Tag: v2.6.16-rc1~474^2~22^2~6^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e508a391a0705f770ef1c4f1c304678b0e8e4fe8;p=pandora-kernel.git

Merge branch 'upstream-fixes'
---

e508a391a0705f770ef1c4f1c304678b0e8e4fe8
Reading git-diff-tree failed