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)
Pick up upstream fixes to avoid conflicts with pending patches.

1  2 
drivers/irqchip/Kconfig
drivers/irqchip/irq-imx-gpcv2.c

Simple merge
Simple merge