From: Jeff Garzik <jgarzik@pobox.com>
Date: Wed, 16 Nov 2005 20:12:58 +0000 (-0500)
Subject: Merge branch 'upstream-fixes'
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=3be4bb06b53df2c0a760eeaa5f53448faddedfca;p=linux-edison.git

Merge branch 'upstream-fixes'
---

3be4bb06b53df2c0a760eeaa5f53448faddedfca