Merge head 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Sun, 31 Jul 2005 23:49:07 +0000 (16:49 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 31 Jul 2005 23:49:07 +0000 (16:49 -0700)
commitbe2ac68f7b66e90b8d25c168fc4d033b034f5c43
treefade4d5cc3dda24334c9927b009cbc9dcaf67a10
parente0b98c79e605f64f263ede53344f283f5e0548be
parente064cd7e3ac797df1e81b55ff4fed5fca5d106b5
Merge head 'upstream-fixes' of /linux/kernel/git/jgarzik/netdev-2.6