From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 15 Mar 2006 22:02:08 +0000 (-0500)
Subject: Merge branch 'upstream-fixes'
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=dd288e7d75b9041f79fecae77d61cfa345da7266;p=linux-edison.git

Merge branch 'upstream-fixes'
---

dd288e7d75b9041f79fecae77d61cfa345da7266