From: Jeff Garzik <jgarzik@pobox.com>
Date: Tue, 17 Jan 2006 15:26:28 +0000 (-0500)
Subject: Merge branch 'upstream'
X-Git-Tag: v2.6.17-rc1~1182^2~130^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0825788ff27c7145e9d558cb2a26f3837d1f9be5;p=pandora-kernel.git

Merge branch 'upstream'
---

0825788ff27c7145e9d558cb2a26f3837d1f9be5
Reading git-diff-tree failed