Skip to content
Commit a01e7b32 authored by Jason Cooper's avatar Jason Cooper
Browse files

Merge branch 'irqchip/stacked-irq_set_wake' into irqchip/core 

Conflicts:
	drivers/irqchip/irq-gic.c
parents fb414e90 008e4d67
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment