Automatic merge of 'misc-fixes' branch from
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Sat, 4 Jun 2005 15:18:39 +0000 (08:18 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Sat, 4 Jun 2005 15:18:39 +0000 (08:18 -0700)
rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6


Trivial merge