Merge branch 'sphinx-fixes-for-docs-next' of git://people.freedesktop.org/~jani/drm...

[karo-tx-linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index a452c404141dfc4607b6cf96bc600ddf7ca33b94..489a913a0bd4bc836d4bbdfcc15639af8ff209e0 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -35,13 +35,13 @@ trivial patch so apply some common sense.
 
        PLEASE check your patch with the automated style checker
        (scripts/checkpatch.pl) to catch trivial style violations.
-       See Documentation/CodingStyle for guidance here.
+       See Documentation/process/coding-style.rst for guidance here.
 
        PLEASE CC: the maintainers and mailing lists that are generated
        by scripts/get_maintainer.pl.  The results returned by the
        script will be best if you have git installed and are making
        your changes in a branch derived from Linus' latest git tree.
-       See Documentation/SubmittingPatches for details.
+       See Documentation/process/submitting-patches.rst for details.
 
        PLEASE try to include any credit lines you want added with the
        patch. It avoids people being missed off by mistake and makes
@@ -54,7 +54,7 @@ trivial patch so apply some common sense.
        of the Linux Foundation certificate of contribution and should
        include a Signed-off-by: line.  The current version of this
        "Developer's Certificate of Origin" (DCO) is listed in the file
-       Documentation/SubmittingPatches.
+       Documentation/process/submitting-patches.rst.
 
 6.     Make sure you have the right to send any changes you make. If you
        do changes at work you may find your employer owns the patch
@@ -2924,7 +2924,7 @@ CAPELLA MICROSYSTEMS LIGHT SENSOR DRIVER
 M:     Kevin Tsai <ktsai@capellamicro.com>
 S:     Maintained
 F:     drivers/iio/light/cm*
-F:     Documentation/devicetree/bindings/i2c/trivial-devices.txt
+F:     Documentation/devicetree/bindings/i2c/trivial-admin-guide/devices.rst
 
 CAVIUM I2C DRIVER
 M:     Jan Glauber <jglauber@cavium.com>
@@ -6131,6 +6131,12 @@ M:       Stanislaw Gruszka <stf_xl@wp.pl>
 S:     Maintained
 F:     drivers/usb/atm/ueagle-atm.c
 
+IMGTEC ASCII LCD DRIVER
+M:     Paul Burton <paul.burton@imgtec.com>
+S:     Maintained
+F:     Documentation/devicetree/bindings/auxdisplay/img-ascii-lcd.txt
+F:     drivers/auxdisplay/img-ascii-lcd.c
+
 INA209 HARDWARE MONITOR DRIVER
 M:     Guenter Roeck <linux@roeck-us.net>
 L:     linux-hwmon@vger.kernel.org
@@ -6442,6 +6448,7 @@ F:        include/linux/mei_cl_bus.h
 F:     drivers/misc/mei/*
 F:     drivers/watchdog/mei_wdt.c
 F:     Documentation/misc-devices/mei/*
+F:     samples/mei/*
 
 INTEL MIC DRIVERS (mic)
 M:     Sudeep Dutt <sudeep.dutt@intel.com>
@@ -9383,6 +9390,7 @@ W:        http://lists.infradead.org/mailman/listinfo/linux-pcmcia
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia.git
 S:     Maintained
 F:     Documentation/pcmcia/
+F:     tools/pcmcia/
 F:     drivers/pcmcia/
 F:     include/pcmcia/
 
@@ -11430,7 +11438,7 @@ STABLE BRANCH
 M:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 L:     stable@vger.kernel.org
 S:     Supported
-F:     Documentation/stable_kernel_rules.txt
+F:     Documentation/process/stable-kernel-rules.rst
 
 STAGING SUBSYSTEM
 M:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
@@ -12869,7 +12877,7 @@ M:      Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 L:     devel@driverdev.osuosl.org
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git
-F:     Documentation/vme_api.txt
+F:     Documentation/driver-api/vme.rst
 F:     drivers/staging/vme/
 F:     drivers/vme/
 F:     include/linux/vme*
@@ -13093,7 +13101,7 @@ T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git
 S:     Maintained
 F:     include/linux/workqueue.h
 F:     kernel/workqueue.c
-F:     Documentation/workqueue.txt
+F:     Documentation/core-api/workqueue.rst
 
 X-POWERS MULTIFUNCTION PMIC DEVICE DRIVERS
 M:     Chen-Yu Tsai <wens@csie.org>