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)
commit9f61f62544747db5d5c590bfae9dd19f1337e421
tree74772cccd14e7ab6d01a3452d4030cd7f8e58ccb
parentde8d1810fda5463ee60ba2937ca68e55a52bd9e7
parent086e8ddb567951513a5dace21a09297768aee14f
Merge branch 'linus' into irq/core

Get the urgent fixes from upstream to avoid conflicts.
kernel/irq/dummychip.c