Automatic merge of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 17 May 2005 03:06:47 +0000 (20:06 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 17 May 2005 03:06:47 +0000 (20:06 -0700)

Trivial merge