Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/tg3-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 28 Dec 2005 21:45:19 +0000 (13:45 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 28 Dec 2005 21:45:19 +0000 (13:45 -0800)

Trivial merge