Merge branch 'for-3.5/drivers' of git://git.kernel.dk/linux-block

[karo-tx-linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index a246490c95eb710fed01405e321d3dc2bcdd0d73..64e675d6d478a3a1444b405537b8406d6b7f1b3b 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2818,6 +2818,12 @@ F:       Documentation/firmware_class/
 F:     drivers/base/firmware*.c
 F:     include/linux/firmware.h
 
+FLOPPY DRIVER
+M:     Jiri Kosina <jkosina@suse.cz>
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/floppy.git
+S:     Odd fixes
+F:     drivers/block/floppy.c
+
 FPU EMULATOR
 M:     Bill Metzenthen <billm@melbpc.org.au>
 W:     http://floatingpoint.sourceforge.net/emulator/index.html