From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 28 Feb 2006 01:13:10 +0000 (-0500)
Subject: Merge branch 'upstream-fixes'
X-Git-Tag: v2.6.17-rc1~1186^2~51^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=acfaf10be5c19f7dceb9d7372039dc45af66b100;p=pandora-kernel.git

Merge branch 'upstream-fixes'
---

acfaf10be5c19f7dceb9d7372039dc45af66b100
Reading git-diff-tree failed