]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 382bd4d f61143c)
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 patch | diff1 | diff2 | blob | history
drivers/irqchip/irq-imx-gpcv2.c patch | diff1 | diff2 | blob | history

diff --cc drivers/irqchip/Kconfig
Simple merge
diff --cc drivers/irqchip/irq-imx-gpcv2.c
Simple merge
Linux kernel for KaRo TX COM modules