Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3270c8ea authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 51d2e09b b09dec2c

MAINTAINERS

+5 −1
Original line number Diff line number Diff line
@@ -5600,6 +5600,7 @@ F: kernel/irq/ 
IRQCHIP DRIVERS

M:	Thomas Gleixner <tglx@linutronix.de>

M:	Jason Cooper <jason@lakedaemon.net>

M:	Marc Zyngier <marc.zyngier@arm.com>

L:	linux-kernel@vger.kernel.org

S:	Maintained

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/ 
F:	drivers/irqchip/



IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)

M:	Benjamin Herrenschmidt <benh@kernel.crashing.org>

M:	Jiang Liu <jiang.liu@linux.intel.com>

M:	Marc Zyngier <marc.zyngier@arm.com>

S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core

F:	Documentation/IRQ-domain.txt

F:	include/linux/irqdomain.h

F:	kernel/irq/irqdomain.c

F:	kernel/irq/msi.c



ISAPNP

M:	Jaroslav Kysela <perex@perex.cz>