Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 5924365f36b237c1e130d2a32a35485fc6bc4199..141b8d3e4ca2498400975dc15e6f18ba0e68d299 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -345,7 +345,7 @@ F:  drivers/acpi/apei/
 
 ACPI COMPONENT ARCHITECTURE (ACPICA)
 M:     Robert Moore <robert.moore@intel.com>
-M:     Erik Schmauss <erik.schmauss@intel.com>
+M:     Erik Kaneda <erik.kaneda@intel.com>
 M:     "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
 L:     linux-acpi@vger.kernel.org
 L:     devel@acpica.org
@@ -2704,6 +2704,14 @@ S:       Maintained
 F:     drivers/pinctrl/aspeed/
 F:     Documentation/devicetree/bindings/pinctrl/aspeed,*
 
+ASPEED SCU INTERRUPT CONTROLLER DRIVER
+M:     Eddie James <eajames@linux.ibm.com>
+L:     linux-aspeed@lists.ozlabs.org (moderated for non-subscribers)
+S:     Maintained
+F:     Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2xxx-scu-ic.txt
+F:     drivers/irqchip/irq-aspeed-scu-ic.c
+F:     include/dt-bindings/interrupt-controller/aspeed-scu-ic.h
+
 ASPEED VIDEO ENGINE DRIVER
 M:     Eddie James <eajames@linux.ibm.com>
 L:     linux-media@vger.kernel.org
@@ -13258,6 +13266,8 @@ T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
 S:     Maintained
 F:     fs/timerfd.c
 F:     include/linux/timer*
+F:     include/linux/time_namespace.h
+F:     kernel/time_namespace.c
 F:     kernel/time/*timer*
 
 POWER MANAGEMENT CORE
@@ -13715,6 +13725,14 @@ S:     Maintained
 F:     Documentation/devicetree/bindings/opp/qcom-nvmem-cpufreq.txt
 F:     drivers/cpufreq/qcom-cpufreq-nvmem.c
 
+QUALCOMM CORE POWER REDUCTION (CPR) AVS DRIVER
+M:     Niklas Cassel <nks@flawful.org>
+L:     linux-pm@vger.kernel.org
+L:     linux-arm-msm@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/power/avs/qcom,cpr.txt
+F:     drivers/power/avs/qcom-cpr.c
+
 QUALCOMM EMAC GIGABIT ETHERNET DRIVER
 M:     Timur Tabi <timur@kernel.org>
 L:     netdev@vger.kernel.org
@@ -14862,6 +14880,7 @@ F:      include/uapi/linux/selinux_netlink.h
 F:     security/selinux/
 F:     scripts/selinux/
 F:     Documentation/admin-guide/LSM/SELinux.rst
+F:     Documentation/ABI/obsolete/sysfs-selinux-disable
 
 SENSABLE PHANTOM
 M:     Jiri Slaby <jirislaby@gmail.com>