From: Jeff Garzik <jeff@garzik.org>
Date: Wed, 1 Mar 2006 06:58:38 +0000 (-0500)
Subject: Merge branch 'upstream-fixes'
X-Git-Tag: v2.6.17-rc1~1186^2~52
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68727fed5469100bec0764207d7efb7a9ecdee29;p=pandora-kernel.git

Merge branch 'upstream-fixes'
---

68727fed5469100bec0764207d7efb7a9ecdee29
Reading git-diff-tree failed