Merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/tg3-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 30 May 2005 05:39:38 +0000 (22:39 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 30 May 2005 05:39:38 +0000 (22:39 -0700)

Trivial merge