Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux-block.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 77b11742785de05e08c1d4bacfc7ba44f41913c5..68528f176875640dd392f80e59e5724ad59b2a19 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7856,13 +7856,6 @@ F:       include/linux/isdn/
 F:     include/uapi/linux/isdn.h
 F:     include/uapi/linux/isdn/
 
-ISDN SUBSYSTEM (Eicon active card driver)
-M:     Armin Schindler <mac@melware.de>
-L:     isdn4linux@listserv.isdn4linux.de (subscribers-only)
-W:     http://www.melware.de
-S:     Maintained
-F:     drivers/isdn/hardware/eicon/
-
 IT87 HARDWARE MONITORING DRIVER
 M:     Jean Delvare <jdelvare@suse.com>
 L:     linux-hwmon@vger.kernel.org
@@ -10692,6 +10685,14 @@ L:     linux-nfc@lists.01.org (moderated for non-subscribers)
 S:     Supported
 F:     drivers/nfc/nxp-nci
 
+OBJAGG
+M:     Jiri Pirko <jiri@mellanox.com>
+L:     netdev@vger.kernel.org
+S:     Supported
+F:     lib/objagg.c
+F:     lib/test_objagg.c
+F:     include/linux/objagg.h
+
 OBJTOOL
 M:     Josh Poimboeuf <jpoimboe@redhat.com>
 M:     Peter Zijlstra <peterz@infradead.org>