From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 27 Jul 2006 18:27:06 +0000 (-0400)
Subject: Merge branch 'from-linus' into upstream
X-Git-Tag: v2.6.19-rc1~1263^2~117^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20f99dcf417a28089ef6c877ae97f5dec2eab435;p=pandora-kernel.git

Merge branch 'from-linus' into upstream
---

20f99dcf417a28089ef6c877ae97f5dec2eab435
Reading git-diff-tree failed