Merge tag 'drm-coc-for-v4.12-rc1' of git://people.freedesktop.org/~airlied/linux

[karo-tx-linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 3f9b7d5382d755700781fbb28d660ad262e75d03..8944b472b90fdd6849e556563311779246129000 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -983,6 +983,7 @@ F:  arch/arm*/include/asm/perf_event.h
 F:     drivers/perf/*
 F:     include/linux/perf/arm_pmu.h
 F:     Documentation/devicetree/bindings/arm/pmu.txt
+F:     Documentation/devicetree/bindings/perf/
 
 ARM PORT
 M:     Russell King <linux@armlinux.org.uk>
@@ -5161,7 +5162,6 @@ F:        include/uapi/linux/firewire*.h
 F:     tools/firewire/
 
 FIRMWARE LOADER (request_firmware)
-M:     Ming Lei <ming.lei@canonical.com>
 M:     Luis R. Rodriguez <mcgrof@kernel.org>
 L:     linux-kernel@vger.kernel.org
 S:     Maintained
@@ -5191,13 +5191,15 @@ F:      include/linux/ipmi-fru.h
 K:     fmc_d.*register
 
 FPGA MANAGER FRAMEWORK
-M:     Alan Tull <atull@opensource.altera.com>
+M:     Alan Tull <atull@kernel.org>
 R:     Moritz Fischer <moritz.fischer@ettus.com>
 L:     linux-fpga@vger.kernel.org
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/atull/linux-fpga.git
+F:     Documentation/fpga/
+F:     Documentation/devicetree/bindings/fpga/
 F:     drivers/fpga/
-F:     include/linux/fpga/fpga-mgr.h
+F:     include/linux/fpga/
 W:     http://www.rocketboards.org
 
 FPU EMULATOR
@@ -5309,6 +5311,7 @@ M:        Scott Wood <oss@buserror.net>
 L:     linuxppc-dev@lists.ozlabs.org
 L:     linux-arm-kernel@lists.infradead.org
 S:     Maintained
+F:     Documentation/devicetree/bindings/powerpc/fsl/
 F:     drivers/soc/fsl/
 F:     include/linux/fsl/
 
@@ -6840,6 +6843,8 @@ T:        git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
 S:     Maintained
 F:     Documentation/devicetree/bindings/iommu/
 F:     drivers/iommu/
+F:     include/linux/iommu.h
+F:     include/linux/iova.h
 
 IP MASQUERADING
 M:     Juanjo Ciarlante <jjciarla@raiz.uncu.edu.ar>
@@ -7567,7 +7572,7 @@ Q:        http://patchwork.ozlabs.org/project/linuxppc-dev/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git
 S:     Supported
 F:     Documentation/ABI/stable/sysfs-firmware-opal-*
-F:     Documentation/devicetree/bindings/powerpc/opal/
+F:     Documentation/devicetree/bindings/powerpc/
 F:     Documentation/devicetree/bindings/rtc/rtc-opal.txt
 F:     Documentation/devicetree/bindings/i2c/i2c-opal.txt
 F:     Documentation/powerpc/
@@ -9131,7 +9136,6 @@ F:        drivers/nvme/target/fcloop.c
 
 NVMEM FRAMEWORK
 M:     Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
-M:     Maxime Ripard <maxime.ripard@free-electrons.com>
 S:     Maintained
 F:     drivers/nvmem/
 F:     Documentation/devicetree/bindings/nvmem/
@@ -13248,6 +13252,15 @@ F:     drivers/usb/
 F:     include/linux/usb.h
 F:     include/linux/usb/
 
+USB TYPEC SUBSYSTEM
+M:     Heikki Krogerus <heikki.krogerus@linux.intel.com>
+L:     linux-usb@vger.kernel.org
+S:     Maintained
+F:     Documentation/ABI/testing/sysfs-class-typec
+F:     Documentation/usb/typec.rst
+F:     drivers/usb/typec/
+F:     include/linux/usb/typec.h
+
 USB UHCI DRIVER
 M:     Alan Stern <stern@rowland.harvard.edu>
 L:     linux-usb@vger.kernel.org