]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'linus' into irq/core
authorThomas Gleixner <tglx@linutronix.de>
Fri, 5 Jun 2015 20:25:01 +0000 (22:25 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Fri, 5 Jun 2015 20:25:01 +0000 (22:25 +0200)
Get the urgent fixes from upstream to avoid conflicts.

1  2 
kernel/irq/dummychip.c

Simple merge