From:  <jgarzik@pretzel.yyz.us>
Date: Sat, 4 Jun 2005 08:31:44 +0000 (-0400)
Subject: Automatic merge of /spare/repo/netdev-2.6 branch r8169-fix
X-Git-Tag: v2.6.12-rc6~7^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=910313aa1db1b0c63ee9684bb4f35c17e7192f43;p=linux-2.6-omap-h63xx.git

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

910313aa1db1b0c63ee9684bb4f35c17e7192f43