From: Jeff Garzik <jgarzik@pobox.com>
Date: Wed, 14 Dec 2005 03:22:41 +0000 (-0500)
Subject: Merge branch 'upstream'
X-Git-Tag: v2.6.17-rc1~1182^2~130^2~2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7fb585940a3dc87a42ebc30a62296e5cf6f9cd5;p=pandora-kernel.git

Merge branch 'upstream'
---

e7fb585940a3dc87a42ebc30a62296e5cf6f9cd5
Reading git-diff-tree failed