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

author Christoffer Dall <christoffer.dall@linaro.org>

Mon, 6 Nov 2017 15:49:26 +0000 (16:49 +0100)

committer Christoffer Dall <christoffer.dall@linaro.org>

Mon, 6 Nov 2017 15:49:26 +0000 (16:49 +0100)
author Christoffer Dall <christoffer.dall@linaro.org>
Mon, 6 Nov 2017 15:49:26 +0000 (16:49 +0100)
committer Christoffer Dall <christoffer.dall@linaro.org>
Mon, 6 Nov 2017 15:49:26 +0000 (16:49 +0100)
diff --cc drivers/irqchip/irq-gic-v3.c
Simple merge
diff --cc drivers/irqchip/irq-gic.c
Simple merge
author	Christoffer Dall <christoffer.dall@linaro.org>
	Mon, 6 Nov 2017 15:49:26 +0000 (16:49 +0100)
committer	Christoffer Dall <christoffer.dall@linaro.org>
	Mon, 6 Nov 2017 15:49:26 +0000 (16:49 +0100)
		1	2
drivers/irqchip/irq-gic-v3.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/irqchip/irq-gic.c	patch \|	diff1 \|	diff2 \|	blob \| history