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)
commitd3045064054a93d303094cfb96d980cc3c82a64c
tree46183aec3aee554af35398057d5da1b632b3d507
parent8be3de3fd8469154a2b3e18a4712032dac5b4a53
parent910313aa1db1b0c63ee9684bb4f35c17e7192f43
Automatic merge of 'misc-fixes' branch from

rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6