aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-08-01 12:47:11 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2015-08-01 12:47:11 -0400
commit3270c8eacc81f000e2f5f03e36f80d6617e2f5c4 (patch)
treeca6c2697e12cd5579ebc0f9b39246558cd67a323
parent51d2e09b942892b9072ae5544f29b176c484f226 (diff)
parentb09dec2c77dc0ef0bb43ade1628ab4b390e74c6d (diff)
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fixlets from Thomas Gleixner: "Just two updates to the maintainers file" * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: MAINTAINERS: Appoint Jiang and Marc as irqdomain maintainers MAINTAINERS: Appoint Marc Zyngier as irqchips co-maintainer
-rw-r--r--MAINTAINERS6
1 files changed, 5 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 9289ecb57b68..a9ae6c105520 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5600,6 +5600,7 @@ F: kernel/irq/
5600IRQCHIP DRIVERS 5600IRQCHIP DRIVERS
5601M: Thomas Gleixner <tglx@linutronix.de> 5601M: Thomas Gleixner <tglx@linutronix.de>
5602M: Jason Cooper <jason@lakedaemon.net> 5602M: Jason Cooper <jason@lakedaemon.net>
5603M: Marc Zyngier <marc.zyngier@arm.com>
5603L: linux-kernel@vger.kernel.org 5604L: linux-kernel@vger.kernel.org
5604S: Maintained 5605S: Maintained
5605T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core 5606T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
@@ -5608,11 +5609,14 @@ F: Documentation/devicetree/bindings/interrupt-controller/
5608F: drivers/irqchip/ 5609F: drivers/irqchip/
5609 5610
5610IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY) 5611IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)
5611M: Benjamin Herrenschmidt <benh@kernel.crashing.org> 5612M: Jiang Liu <jiang.liu@linux.intel.com>
5613M: Marc Zyngier <marc.zyngier@arm.com>
5612S: Maintained 5614S: Maintained
5615T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
5613F: Documentation/IRQ-domain.txt 5616F: Documentation/IRQ-domain.txt
5614F: include/linux/irqdomain.h 5617F: include/linux/irqdomain.h
5615F: kernel/irq/irqdomain.c 5618F: kernel/irq/irqdomain.c
5619F: kernel/irq/msi.c
5616 5620
5617ISAPNP 5621ISAPNP
5618M: Jaroslav Kysela <perex@perex.cz> 5622M: Jaroslav Kysela <perex@perex.cz>