From: Jeff Garzik <jeff@garzik.org>
Date: Sat, 29 Jul 2006 05:29:27 +0000 (-0400)
Subject: Merge branch 'upstream-fixes' into upstream
X-Git-Tag: v2.6.19-rc1~1263^2~115
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=053dd21789eb8fdf9e69982bd223e4cf644c1477;p=pandora-kernel.git

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

053dd21789eb8fdf9e69982bd223e4cf644c1477