]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'linus' into irq/core
authorThomas Gleixner <tglx@linutronix.de>
Tue, 20 Jun 2017 20:08:32 +0000 (22:08 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Tue, 20 Jun 2017 20:08:32 +0000 (22:08 +0200)
Get upstream changes so pending patches won't conflict.

1  2 
kernel/irq/manage.c

Simple merge