From: Jeff Garzik <jeff@garzik.org>
Date: Fri, 17 Mar 2006 00:27:08 +0000 (-0500)
Subject: Merge branch 'upstream-fixes'
X-Git-Tag: v2.6.17-rc1~1186^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=abc71c46dc0a12ab7fddc18cfe4f4aa26808c79b;p=pandora-kernel.git

Merge branch 'upstream-fixes'
---

abc71c46dc0a12ab7fddc18cfe4f4aa26808c79b
Reading git-diff-tree failed