Merge tag 'dmaengine-6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul...

[linux-2.6-microblaze.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 28cc786..9737e8d 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -10460,11 +10460,6 @@ T:     git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
 F:     drivers/iommu/intel/
 F:     include/linux/intel-svm.h
 
-INTEL IOP-ADMA DMA DRIVER
-R:     Dan Williams <dan.j.williams@intel.com>
-S:     Odd fixes
-F:     drivers/dma/iop-adma.c
-
 INTEL IPU3 CSI-2 CIO2 DRIVER
 M:     Yong Zhi <yong.zhi@intel.com>
 M:     Sakari Ailus <sakari.ailus@linux.intel.com>
@@ -13629,7 +13624,6 @@ L:      dmaengine@vger.kernel.org
 S:     Supported
 F:     Documentation/devicetree/bindings/dma/atmel-dma.txt
 F:     drivers/dma/at_hdmac.c
-F:     drivers/dma/at_hdmac_regs.h
 F:     drivers/dma/at_xdmac.c
 F:     include/dt-bindings/dma/at91.h
 
@@ -23055,8 +23049,7 @@ F:      drivers/media/pci/zoran/
 
 ZRAM COMPRESSED RAM BLOCK DEVICE DRVIER
 M:     Minchan Kim <minchan@kernel.org>
-M:     Nitin Gupta <ngupta@vflare.org>
-R:     Sergey Senozhatsky <senozhatsky@chromium.org>
+M:     Sergey Senozhatsky <senozhatsky@chromium.org>
 L:     linux-kernel@vger.kernel.org
 S:     Maintained
 F:     Documentation/admin-guide/blockdev/zram.rst
@@ -23069,8 +23062,7 @@ F:      drivers/tty/serial/zs.*
 
 ZSMALLOC COMPRESSED SLAB MEMORY ALLOCATOR
 M:     Minchan Kim <minchan@kernel.org>
-M:     Nitin Gupta <ngupta@vflare.org>
-R:     Sergey Senozhatsky <senozhatsky@chromium.org>
+M:     Sergey Senozhatsky <senozhatsky@chromium.org>
 L:     linux-mm@kvack.org
 S:     Maintained
 F:     Documentation/mm/zsmalloc.rst