Merge branch 'linus' into irq/core
authorThomas Gleixner <tglx@linutronix.de>
Thu, 20 Apr 2017 14:05:13 +0000 (16:05 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Thu, 20 Apr 2017 14:05:13 +0000 (16:05 +0200)
commit7a258ff04f9d5fe549fed6d03931a0236587047e
tree6b164332c2a3983d972cc4dc47af3fce6cc5dc32
parent382bd4de61827dbaaf5fb4fb7b1f4be4a86505e7
parentf61143c45077df4fa78e2f1ba455a00bbe1d5b8c
Merge branch 'linus' into irq/core

Pick up upstream fixes to avoid conflicts with pending patches.
drivers/irqchip/Kconfig
drivers/irqchip/irq-imx-gpcv2.c