diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-01 12:47:11 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-01 12:47:11 -0400 |
commit | 3270c8eacc81f000e2f5f03e36f80d6617e2f5c4 (patch) | |
tree | ca6c2697e12cd5579ebc0f9b39246558cd67a323 | |
parent | 51d2e09b942892b9072ae5544f29b176c484f226 (diff) | |
parent | b09dec2c77dc0ef0bb43ade1628ab4b390e74c6d (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-- | MAINTAINERS | 6 |
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/ | |||
5600 | IRQCHIP DRIVERS | 5600 | IRQCHIP DRIVERS |
5601 | M: Thomas Gleixner <tglx@linutronix.de> | 5601 | M: Thomas Gleixner <tglx@linutronix.de> |
5602 | M: Jason Cooper <jason@lakedaemon.net> | 5602 | M: Jason Cooper <jason@lakedaemon.net> |
5603 | M: Marc Zyngier <marc.zyngier@arm.com> | ||
5603 | L: linux-kernel@vger.kernel.org | 5604 | L: linux-kernel@vger.kernel.org |
5604 | S: Maintained | 5605 | S: Maintained |
5605 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core | 5606 | T: 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/ | |||
5608 | F: drivers/irqchip/ | 5609 | F: drivers/irqchip/ |
5609 | 5610 | ||
5610 | IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY) | 5611 | IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY) |
5611 | M: Benjamin Herrenschmidt <benh@kernel.crashing.org> | 5612 | M: Jiang Liu <jiang.liu@linux.intel.com> |
5613 | M: Marc Zyngier <marc.zyngier@arm.com> | ||
5612 | S: Maintained | 5614 | S: Maintained |
5615 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core | ||
5613 | F: Documentation/IRQ-domain.txt | 5616 | F: Documentation/IRQ-domain.txt |
5614 | F: include/linux/irqdomain.h | 5617 | F: include/linux/irqdomain.h |
5615 | F: kernel/irq/irqdomain.c | 5618 | F: kernel/irq/irqdomain.c |
5619 | F: kernel/irq/msi.c | ||
5616 | 5620 | ||
5617 | ISAPNP | 5621 | ISAPNP |
5618 | M: Jaroslav Kysela <perex@perex.cz> | 5622 | M: Jaroslav Kysela <perex@perex.cz> |