From:  <jgarzik@pretzel.yyz.us>
Date: Sat, 28 May 2005 02:07:02 +0000 (-0400)
Subject: Automatic merge of /spare/repo/netdev-2.6 branch master
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=1f15d694522af9cd7492695f11dd2dc77b6cf098;p=linux-edison.git

Merge ... /spare/repo/netdev-2.6 branch master
---

1f15d694522af9cd7492695f11dd2dc77b6cf098