From: Jeff Garzik <jgarzik@pobox.com>
Date: Tue, 13 Dec 2005 07:32:01 +0000 (-0500)
Subject: Merge branch 'upstream'
X-Git-Tag: v2.6.18-rc1~1079^2~98^2~13^2~68
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e8b09428482deff1a9d7a36d371acee364182ec3;p=pandora-kernel.git

Merge branch 'upstream'
---

e8b09428482deff1a9d7a36d371acee364182ec3
Reading git-diff-tree failed