Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

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

Mon, 16 Jan 2006 00:43:29 +0000 (16:43 -0800)

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

Mon, 16 Jan 2006 00:43:29 +0000 (16:43 -0800)
author Linus Torvalds <torvalds@g5.osdl.org>
Mon, 16 Jan 2006 00:43:29 +0000 (16:43 -0800)
committer Linus Torvalds <torvalds@g5.osdl.org>
Mon, 16 Jan 2006 00:43:29 +0000 (16:43 -0800)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/net/Kconfig
Simple merge
author	Linus Torvalds <torvalds@g5.osdl.org>
	Mon, 16 Jan 2006 00:43:29 +0000 (16:43 -0800)
committer	Linus Torvalds <torvalds@g5.osdl.org>
	Mon, 16 Jan 2006 00:43:29 +0000 (16:43 -0800)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history