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

[linux-2.6-microblaze.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index a9efff1..3947855 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2828,9 +2828,7 @@ S:        Odd fixes
 W:     http://sourceforge.net/projects/xscaleiop
 F:     Documentation/crypto/async-tx-api.rst
 F:     crypto/async_tx/
-F:     drivers/dma/
 F:     include/linux/async_tx.h
-F:     include/linux/dmaengine.h
 
 AT24 EEPROM DRIVER
 M:     Bartosz Golaszewski <bgolaszewski@baylibre.com>
@@ -4436,6 +4434,17 @@ M:       Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
 S:     Maintained
 F:     include/linux/compiler_attributes.h
 
+COMPUTE EXPRESS LINK (CXL)
+M:     Alison Schofield <alison.schofield@intel.com>
+M:     Vishal Verma <vishal.l.verma@intel.com>
+M:     Ira Weiny <ira.weiny@intel.com>
+M:     Ben Widawsky <ben.widawsky@intel.com>
+M:     Dan Williams <dan.j.williams@intel.com>
+L:     linux-cxl@vger.kernel.org
+S:     Maintained
+F:     drivers/cxl/
+F:     include/uapi/linux/cxl_mem.h
+
 CONEXANT ACCESSRUNNER USB DRIVER
 L:     accessrunner-general@lists.sourceforge.net
 S:     Orphan
@@ -5271,6 +5280,7 @@ T:        git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git
 F:     Documentation/devicetree/bindings/dma/
 F:     Documentation/driver-api/dmaengine/
 F:     drivers/dma/
+F:     include/linux/dma/
 F:     include/linux/dmaengine.h
 F:     include/linux/of_dma.h
 
@@ -7908,6 +7918,12 @@ F:       drivers/hid/
 F:     include/linux/hid*
 F:     include/uapi/linux/hid*
 
+HID PLAYSTATION DRIVER
+M:     Roderick Colenbrander <roderick.colenbrander@sony.com>
+L:     linux-input@vger.kernel.org
+S:     Supported
+F:     drivers/hid/hid-playstation.c
+
 HID SENSOR HUB DRIVERS
 M:     Jiri Kosina <jikos@kernel.org>
 M:     Jonathan Cameron <jic23@kernel.org>
@@ -11608,7 +11624,6 @@ 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
-F:     include/linux/platform_data/dma-atmel.h
 
 MICROCHIP AT91 SERIAL DRIVER
 M:     Richard Genoud <richard.genoud@gmail.com>