From: Jeff Garzik <jgarzik@pobox.com>
Date: Wed, 9 Nov 2005 06:37:34 +0000 (-0500)
Subject: Merge branch 'upstream'
X-Git-Tag: v2.6.17-rc1~1182^2~130^2~11
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8006fdd6dc387abaa4b683bda4868c879fd76070;p=pandora-kernel.git

Merge branch 'upstream'
---

8006fdd6dc387abaa4b683bda4868c879fd76070
Reading git-diff-tree failed