From:  <jgarzik@pretzel.yyz.us>
Date: Wed, 25 May 2005 17:57:15 +0000 (-0400)
Subject: Automatic merge of /spare/repo/netdev-2.6 branch ixgb
X-Git-Tag: v2.6.12-rc6~160^2~2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=09e62666d8a6312426f96bf483cdb003bde556fe;p=linux.git

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

09e62666d8a6312426f96bf483cdb003bde556fe