Merge branch 'linus' into irq/core

Get the urgent fixes from upstream to avoid conflicts.
2015-06-05 22:25:01 +02:00
parent de8d1810fd 086e8ddb56
commit 9f61f62544
692 changed files with 7329 additions and 5450 deletions
--- a/kernel/irq/dummychip.c
+++ b/kernel/irq/dummychip.c
@@ -58,5 +58,6 @@ struct irq_chip dummy_irq_chip = {
 	.irq_ack	= noop,
 	.irq_mask	= noop,
 	.irq_unmask	= noop,
+	.flags		= IRQCHIP_SKIP_SET_WAKE,
 };
 EXPORT_SYMBOL_GPL(dummy_irq_chip);