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

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

Sat, 12 Nov 2005 00:29:22 +0000 (16:29 -0800)

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

Sat, 12 Nov 2005 00:29:22 +0000 (16:29 -0800)
author Linus Torvalds <torvalds@g5.osdl.org>
Sat, 12 Nov 2005 00:29:22 +0000 (16:29 -0800)
committer Linus Torvalds <torvalds@g5.osdl.org>
Sat, 12 Nov 2005 00:29:22 +0000 (16:29 -0800)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/block/floppy.c
Simple merge
author	Linus Torvalds <torvalds@g5.osdl.org>
	Sat, 12 Nov 2005 00:29:22 +0000 (16:29 -0800)
committer	Linus Torvalds <torvalds@g5.osdl.org>
	Sat, 12 Nov 2005 00:29:22 +0000 (16:29 -0800)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/block/floppy.c	patch \|	diff1 \|	diff2 \|	blob \| history