Merge of 'for-linus' branch from
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 25 May 2005 21:01:50 +0000 (14:01 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 25 May 2005 21:01:50 +0000 (14:01 -0700)
rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6


Trivial merge