Merge tag 'driver-core-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 3dc5d89..5504c0d 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6067,6 +6067,13 @@ F:       include/linux/irqdomain.h
 F:     kernel/irq/irqdomain.c
 F:     kernel/irq/msi.c
 
+ISA
+M:     William Breathitt Gray <vilhelm.gray@gmail.com>
+S:     Maintained
+F:     Documentation/isa.txt
+F:     drivers/base/isa.c
+F:     include/linux/isa.h
+
 ISAPNP
 M:     Jaroslav Kysela <perex@perex.cz>
 S:     Maintained