From: Jeff Garzik <jgarzik@pobox.com>
Date: Sun, 20 Nov 2005 05:41:08 +0000 (-0500)
Subject: Merge branch 'upstream'
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=8238e747b62db977f80bfd4e5694d4fc2c1112d5;p=linux-edison.git

Merge branch 'upstream'
---

8238e747b62db977f80bfd4e5694d4fc2c1112d5