From:  <jgarzik@pretzel.yyz.us>
Date: Sat, 4 Jun 2005 21:06:57 +0000 (-0400)
Subject: Automatic merge of /spare/repo/netdev-2.6 branch r8169
X-Git-Tag: v2.6.14-rc2~49^2~36^2~53^2~7
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=7f6a57a907c8655e78a654ab62da86e61ef7f2c9;p=linux-2.6-omap-h63xx.git

Automatic merge of /spare/repo/netdev-2.6 branch r8169
---

7f6a57a907c8655e78a654ab62da86e61ef7f2c9