From: Jeff Garzik <jeff@garzik.org>
Date: Wed, 24 May 2006 05:32:42 +0000 (-0400)
Subject: Merge branch 'master' into upstream
X-Git-Tag: v2.6.18-rc1~1079^2~90
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26e27cd424554202d36f38ee35421143788da127;p=pandora-kernel.git

Merge branch 'master' into upstream
---

26e27cd424554202d36f38ee35421143788da127
Reading git-diff-tree failed