Merge of /home/davem/src/GIT/tg3-2.6/
authorDavid S. Miller <davem@sunset.davemloft.net>
Mon, 30 May 2005 04:25:01 +0000 (21:25 -0700)
committerDavid S. Miller <davem@sunset.davemloft.net>
Mon, 30 May 2005 04:25:01 +0000 (21:25 -0700)

Trivial merge