From: Jeff Garzik <jgarzik@pobox.com>
Date: Fri, 18 Nov 2005 16:44:17 +0000 (-0500)
Subject: Merge branch 'upstream'
X-Git-Tag: v2.6.18-rc1~1079^2~98^2~13^2~77
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f333b3f111e9db76109e304df8ee777ace7fbf86;p=pandora-kernel.git

Merge branch 'upstream'
---

f333b3f111e9db76109e304df8ee777ace7fbf86
Reading git-diff-tree failed