Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
[linux-2.6.git] / MAINTAINERS
index 9e28c5c..a1fe87a 100644 (file)
@@ -2112,6 +2112,15 @@ W:       http://sourceforge.net/projects/lpfcxxxx
 S:     Supported
 F:     drivers/scsi/lpfc/
 
+ENE CB710 FLASH CARD READER DRIVER
+P:     Michał Mirosław
+M:     mirq-linux@rere.qmqm.pl
+L:     linux-kernel@vger.kernel.org
+S:     Maintained
+F:     drivers/misc/cb710/
+F:     drivers/mmc/host/cb710-mmc.*
+F:     include/linux/cb710.h
+
 EPSON 1355 FRAMEBUFFER DRIVER
 P:     Christopher Hoover
 M:     ch@murgatroid.com