Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
Linus Torvalds [Sat, 12 Nov 2005 00:29:22 +0000 (16:29 -0800)]
1  2 
MAINTAINERS
drivers/block/floppy.c

diff --cc MAINTAINERS
Simple merge
Simple merge