]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
projects / mirror_ubuntu-kernels.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: de8d181 086e8dd)
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 patch | diff1 | diff2 | blob | history

diff --cc kernel/irq/dummychip.c
Simple merge
Ubuntu combined Linux kernel mirror