Merge branch 'core-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index a9c9c9ff72d8d41ce2b2ce1e54e4b4f8111a7bb5..4ad9d6a4c3ac8cda713c484b48e635c2e11ad884 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -875,6 +875,12 @@ S: Supported
 F:     drivers/android/
 F:     drivers/staging/android/
 
+ANDROID GOLDFISH PIC DRIVER
+M:     Miodrag Dinic <miodrag.dinic@mips.com>
+S:     Supported
+F:     Documentation/devicetree/bindings/interrupt-controller/google,goldfish-pic.txt
+F:     drivers/irqchip/irq-goldfish-pic.c
+
 ANDROID GOLDFISH RTC DRIVER
 M:     Miodrag Dinic <miodrag.dinic@mips.com>
 S:     Supported
@@ -9757,6 +9763,15 @@ S:       Supported
 F:     Documentation/filesystems/ntfs.txt
 F:     fs/ntfs/
 
+NUBUS SUBSYSTEM
+M:     Finn Thain <fthain@telegraphics.com.au>
+L:     linux-m68k@lists.linux-m68k.org
+S:     Maintained
+F:     arch/*/include/asm/nubus.h
+F:     drivers/nubus/
+F:     include/linux/nubus.h
+F:     include/uapi/linux/nubus.h
+
 NVIDIA (rivafb and nvidiafb) FRAMEBUFFER DRIVER
 M:     Antonino Daplas <adaplas@gmail.com>
 L:     linux-fbdev@vger.kernel.org