Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

author Linus Torvalds <torvalds@g5.osdl.org>

Thu, 5 Jan 2006 00:31:56 +0000 (16:31 -0800)

committer Linus Torvalds <torvalds@g5.osdl.org>

Thu, 5 Jan 2006 00:31:56 +0000 (16:31 -0800)
author Linus Torvalds <torvalds@g5.osdl.org>
Thu, 5 Jan 2006 00:31:56 +0000 (16:31 -0800)
committer Linus Torvalds <torvalds@g5.osdl.org>
Thu, 5 Jan 2006 00:31:56 +0000 (16:31 -0800)
diff --cc drivers/net/sk98lin/skge.c
Simple merge
diff --cc drivers/net/skge.c
Simple merge
diff --cc drivers/net/wireless/ipw2200.c
Simple merge
diff --cc net/core/dev.c
Simple merge
author	Linus Torvalds <torvalds@g5.osdl.org>
	Thu, 5 Jan 2006 00:31:56 +0000 (16:31 -0800)
committer	Linus Torvalds <torvalds@g5.osdl.org>
	Thu, 5 Jan 2006 00:31:56 +0000 (16:31 -0800)
		1	2
drivers/net/sk98lin/skge.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/skge.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ipw2200.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	patch \|	diff1 \|	diff2 \|	blob \| history