Merge tag 'disintegrate-sparc-20121009' of git://git.infradead.org/users/dhowells...

[pandora-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 84ee867..eae3cd8 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7039,6 +7039,14 @@ S:       Maintained
 F:     Documentation/svga.txt
 F:     arch/x86/boot/video*
 
+SWIOTLB SUBSYSTEM
+M:     Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+L:     linux-kernel@vger.kernel.org
+S:     Supported
+F:     lib/swiotlb.c
+F:     arch/*/kernel/pci-swiotlb.c
+F:     include/linux/swiotlb.h
+
 SYSV FILESYSTEM
 M:     Christoph Hellwig <hch@infradead.org>
 S:     Maintained
@@ -7170,6 +7178,8 @@ F:        drivers/char/tlclk.c
 
 TENSILICA XTENSA PORT (xtensa)
 M:     Chris Zankel <chris@zankel.net>
+M:     Max Filippov <jcmvbkbc@gmail.com>
+L:     linux-xtensa@linux-xtensa.org
 S:     Maintained
 F:     arch/xtensa/
 
@@ -7457,6 +7467,12 @@ F:       drivers/mtd/ubi/
 F:     include/linux/mtd/ubi.h
 F:     include/mtd/ubi-user.h
 
+UNSORTED BLOCK IMAGES (UBI) Fastmap
+M:     Richard Weinberger <richard@nod.at>
+L:     linux-mtd@lists.infradead.org
+S:     Maintained
+F:     drivers/mtd/ubi/fastmap.c
+
 USB ACM DRIVER
 M:     Oliver Neukum <oliver@neukum.org>
 L:     linux-usb@vger.kernel.org