diff --git a/[refs] b/[refs]
index fe2b8b5ba493..cf6c4f2c651e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bfa10b8c98bb335bc3e401d3ec947d446f04d1aa
+refs/heads/master: 8206f664bfd7121e79f3b3fbf967953dbed78d7f
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index bb76fc42fc42..2c2fba2c37b3 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -2770,6 +2770,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