summaryrefslogtreecommitdiff
path: root/include/linux/irq.h
diff options
context:
space:
mode:
authorJason Cooper <jason@lakedaemon.net>2015-04-11 01:58:19 +0300
committerJason Cooper <jason@lakedaemon.net>2015-04-11 01:58:19 +0300
commita01e7b3258bea93fbf1f028fab1c739d80c61823 (patch)
treef78d0d13faa406524a58d9ce64756ffdabb64400 /include/linux/irq.h
parentfb414e908b15ae3d704aa0572f77981a516279b9 (diff)
parent008e4d6735091bfe5be12918cb66c55e178361bf (diff)
downloadlinux-a01e7b3258bea93fbf1f028fab1c739d80c61823.tar.xz
Merge branch 'irqchip/stacked-irq_set_wake' into irqchip/core
Conflicts: drivers/irqchip/irq-gic.c
Diffstat (limited to 'include/linux/irq.h')
0 files changed, 0 insertions, 0 deletions