Merge branches 'pm-domains', 'pm-sleep' and 'pm-cpufreq'

[karo-tx-linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index ba64d98e78975f1e0f66773f9d00190bbb6ac703..1f949b5a39d373d883906716a3b3343b9e5f8661 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -478,7 +478,7 @@ L:  linux-hwmon@vger.kernel.org
 S:     Maintained
 F:     Documentation/hwmon/ads1015
 F:     drivers/hwmon/ads1015.c
-F:     include/linux/i2c/ads1015.h
+F:     include/linux/platform_data/ads1015.h
 
 ADT746X FAN DRIVER
 M:     Colin Leroy <colin@colino.net>
@@ -3597,7 +3597,6 @@ T:        git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
 S:     Maintained
 F:     Documentation/crypto/
 F:     Documentation/devicetree/bindings/crypto/
-F:     Documentation/DocBook/crypto-API.tmpl
 F:     arch/*/crypto/
 F:     crypto/
 F:     drivers/crypto/
@@ -4154,8 +4153,7 @@ M:        Jonathan Corbet <corbet@lwn.net>
 L:     linux-doc@vger.kernel.org
 S:     Maintained
 F:     Documentation/
-F:     scripts/docproc.c
-F:     scripts/kernel-doc*
+F:     scripts/kernel-doc
 X:     Documentation/ABI/
 X:     Documentation/devicetree/
 X:     Documentation/acpi
@@ -7366,7 +7364,7 @@ KEYS/KEYRINGS:
 M:     David Howells <dhowells@redhat.com>
 L:     keyrings@vger.kernel.org
 S:     Maintained
-F:     Documentation/security/keys.txt
+F:     Documentation/security/keys/core.rst
 F:     include/linux/key.h
 F:     include/linux/key-type.h
 F:     include/linux/keyctl.h
@@ -7380,7 +7378,7 @@ M:        Mimi Zohar <zohar@linux.vnet.ibm.com>
 L:     linux-security-module@vger.kernel.org
 L:     keyrings@vger.kernel.org
 S:     Supported
-F:     Documentation/security/keys-trusted-encrypted.txt
+F:     Documentation/security/keys/trusted-encrypted.rst
 F:     include/keys/trusted-type.h
 F:     security/keys/trusted.c
 F:     security/keys/trusted.h
@@ -7391,7 +7389,7 @@ M:        David Safford <safford@us.ibm.com>
 L:     linux-security-module@vger.kernel.org
 L:     keyrings@vger.kernel.org
 S:     Supported
-F:     Documentation/security/keys-trusted-encrypted.txt
+F:     Documentation/security/keys/trusted-encrypted.rst
 F:     include/keys/encrypted-type.h
 F:     security/keys/encrypted-keys/
 
@@ -7401,7 +7399,7 @@ W:        http://kgdb.wiki.kernel.org/
 L:     kgdb-bugreport@lists.sourceforge.net
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git
 S:     Maintained
-F:     Documentation/DocBook/kgdb.tmpl
+F:     Documentation/dev-tools/kgdb.rst
 F:     drivers/misc/kgdbts.c
 F:     drivers/tty/serial/kgdboc.c
 F:     include/linux/kdb.h
@@ -8078,11 +8076,11 @@ S:      Supported
 F:     drivers/power/supply/max14577_charger.c
 F:     drivers/power/supply/max77693_charger.c
 
-MAXIM MAX77802 MULTIFUNCTION PMIC DEVICE DRIVERS
-M:     Javier Martinez Canillas <javier@osg.samsung.com>
+MAXIM MAX77802 PMIC REGULATOR DEVICE DRIVER
+M:     Javier Martinez Canillas <javier@dowhile0.org>
 L:     linux-kernel@vger.kernel.org
 S:     Supported
-F:     drivers/*/*max77802*.c
+F:     drivers/regulator/max77802-regulator.c
 F:     Documentation/devicetree/bindings/*/*max77802.txt
 F:     include/dt-bindings/*/*max77802.h
 
@@ -10181,7 +10179,7 @@ T:      git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git
 S:     Maintained
 F:     Documentation/hwmon/pmbus
 F:     drivers/hwmon/pmbus/
-F:     include/linux/i2c/pmbus.h
+F:     include/linux/pmbus.h
 
 PMC SIERRA MaxRAID DRIVER
 L:     linux-scsi@vger.kernel.org
@@ -11020,7 +11018,7 @@ S:      Supported
 F:     arch/s390/
 F:     drivers/s390/
 F:     Documentation/s390/
-F:     Documentation/DocBook/s390*
+F:     Documentation/driver-api/s390-drivers.rst
 
 S390 COMMON I/O LAYER
 M:     Sebastian Ott <sebott@linux.vnet.ibm.com>
@@ -11524,6 +11522,7 @@ F:      kernel/seccomp.c
 F:     include/uapi/linux/seccomp.h
 F:     include/linux/seccomp.h
 F:     tools/testing/selftests/seccomp/*
+F:     Documentation/userspace-api/seccomp_filter.rst
 K:     \bsecure_computing
 K:     \bTIF_SECCOMP\b
 
@@ -11582,6 +11581,7 @@ S:      Supported
 F:     include/linux/selinux*
 F:     security/selinux/
 F:     scripts/selinux/
+F:     Documentation/admin-guide/LSM/SELinux.rst
 
 APPARMOR SECURITY MODULE
 M:     John Johansen <john.johansen@canonical.com>
@@ -11590,18 +11590,21 @@ W:    apparmor.wiki.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jj/apparmor-dev.git
 S:     Supported
 F:     security/apparmor/
+F:     Documentation/admin-guide/LSM/apparmor.rst
 
 LOADPIN SECURITY MODULE
 M:     Kees Cook <keescook@chromium.org>
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git lsm/loadpin
 S:     Supported
 F:     security/loadpin/
+F:     Documentation/admin-guide/LSM/LoadPin.rst
 
 YAMA SECURITY MODULE
 M:     Kees Cook <keescook@chromium.org>
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git yama/tip
 S:     Supported
 F:     security/yama/
+F:     Documentation/admin-guide/LSM/Yama.rst
 
 SENSABLE PHANTOM
 M:     Jiri Slaby <jirislaby@gmail.com>
@@ -11904,7 +11907,7 @@ L:      linux-security-module@vger.kernel.org
 W:     http://schaufler-ca.com
 T:     git git://github.com/cschaufler/smack-next
 S:     Maintained
-F:     Documentation/security/Smack.txt
+F:     Documentation/admin-guide/LSM/Smack.rst
 F:     security/smack/
 
 DRIVERS FOR ADAPTIVE VOLTAGE SCALING (AVS)
@@ -12912,7 +12915,7 @@ M:      Wolfram Sang <wsa+renesas@sang-engineering.com>
 L:     linux-mmc@vger.kernel.org
 S:     Supported
 F:     drivers/mmc/host/tmio_mmc*
-F:     drivers/mmc/host/sh_mobile_sdhi.c
+F:     drivers/mmc/host/renesas_sdhi*
 F:     include/linux/mfd/tmio.h
 
 TMP401 HARDWARE MONITOR DRIVER