summaryrefslogtreecommitdiff
path: root/include/dt-bindings/interrupt-controller
ModeNameSize
-rw-r--r--arm-gic.h490logplain
-rw-r--r--irq-st.h859logplain
-rw-r--r--irq.h565logplain
-rw-r--r--mips-gic.h207logplain
t-subject'>Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/trace/events/context_tracking.h')