From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 5 Jun 2006 19:31:57 +0000 (-0400)
Subject: Merge branch 'upstream-fixes' into upstream
X-Git-Tag: v2.6.18-rc1~1115^2~23^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6882a0688ea83db5fc2f3491ac9fcdce0834cc7;p=pandora-kernel.git

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

f6882a0688ea83db5fc2f3491ac9fcdce0834cc7
Reading git-diff-tree failed