From: Jeff Garzik <jeff@garzik.org>
Date: Sat, 19 Aug 2006 21:27:12 +0000 (-0400)
Subject: Merge branch 'master' into upstream-fixes
X-Git-Tag: v2.6.18-rc5~60^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d14b50cc60ca465290fcdb3b88e7d5fb684361ed;p=pandora-kernel.git

Merge branch 'master' into upstream-fixes
---

d14b50cc60ca465290fcdb3b88e7d5fb684361ed
Reading git-diff-tree failed