]> git.hungrycats.org Git - linux/commitdiff
Merge http://gkernel.bkbits.net/ethtool-2.6
authorLinus Torvalds <torvalds@home.osdl.org>
Sun, 17 Aug 2003 04:43:33 +0000 (21:43 -0700)
committerLinus Torvalds <torvalds@home.osdl.org>
Sun, 17 Aug 2003 04:43:33 +0000 (21:43 -0700)
into home.osdl.org:/home/torvalds/v2.5/linux


Trivial merge