From: Jeff Garzik <jeff@garzik.org>
Date: Thu, 27 Apr 2006 08:53:34 +0000 (-0400)
Subject: Merge branch 'master' into upstream
X-Git-Tag: v2.6.18-rc1~1079^2~100
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=acc696d93dcf993dec123d69d599979e1456ffec;p=pandora-kernel.git

Merge branch 'master' into upstream
---

acc696d93dcf993dec123d69d599979e1456ffec
Reading git-diff-tree failed