From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 11 Sep 2006 20:40:03 +0000 (-0400)
Subject: Merge branch 'upstream-fixes' into upstream
X-Git-Tag: v2.6.19-rc1~1263^2~38^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=34fa0e319c760189f1fc226acc5b3b387dc58099;p=pandora-kernel.git

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

34fa0e319c760189f1fc226acc5b3b387dc58099
Reading git-diff-tree failed