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 1bfc0c71d7876ba8049091df724a4c42d96bdae4..141b8d3e4ca2498400975dc15e6f18ba0e68d299 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -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