From: Jeff Garzik <jeff@garzik.org>
Date: Sat, 27 May 2006 01:30:38 +0000 (-0400)
Subject: Merge branch 'master' into upstream
X-Git-Tag: v2.6.18-rc1~1079^2~77
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=835d39fcb56cba00b78c60634d6bb0f046ef601c;p=pandora-kernel.git

Merge branch 'master' into upstream
---

835d39fcb56cba00b78c60634d6bb0f046ef601c
Reading git-diff-tree failed