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

Merge branch 'upstream-fixes'
---

5b69e69d4e6386bcb6592c75af897e5e79641602
Reading git-diff-tree failed