From: Jeff Garzik <jeff@garzik.org>
Date: Wed, 26 Apr 2006 10:18:00 +0000 (-0400)
Subject: Merge branch 'upstream-fixes' into upstream
X-Git-Tag: v2.6.18-rc1~1115^2~89
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45de6fd958d7f407bdb5fdc6914b3262519d891c;p=pandora-kernel.git

Merge branch 'upstream-fixes' into upstream
---

45de6fd958d7f407bdb5fdc6914b3262519d891c
Reading git-diff-tree failed