From: Jeff Garzik <jgarzik@pobox.com>
Date: Sat, 22 Oct 2005 01:33:27 +0000 (-0400)
Subject: Merge branch 'upstream'
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=e78a57de94480226f7fc90d0b4837bfc6c99a9e0;p=linux-edison.git

Merge branch 'upstream'
---

e78a57de94480226f7fc90d0b4837bfc6c99a9e0