| commit | a01e7b3258bea93fbf1f028fab1c739d80c61823 | [log] [tgz] |
|---|---|---|
| author | Jason Cooper <jason@lakedaemon.net> | Fri Apr 10 22:58:19 2015 +0000 |
| committer | Jason Cooper <jason@lakedaemon.net> | Fri Apr 10 22:58:19 2015 +0000 |
| tree | f78d0d13faa406524a58d9ce64756ffdabb64400 | |
| parent | fb414e908b15ae3d704aa0572f77981a516279b9 [diff] | |
| parent | 008e4d6735091bfe5be12918cb66c55e178361bf [diff] |
Merge branch 'irqchip/stacked-irq_set_wake' into irqchip/core Conflicts: drivers/irqchip/irq-gic.c