summaryrefslogtreecommitdiff
path: root/include/trace
diff options
context:
space:
mode:
Diffstat (limited to 'include/trace')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-01 00:43:00 +0000
e2160156bf2a7d5018e99a9993fbcdda0abac09b'>patch) tree1a70cb13dcfa7ade4c48d8a64d20543abebfb1dc /include/soc parent62e13097c46c69dbd7544ab2cd585ccf48f360a4 (diff)parent6d04dfc8966019b8b0977b2cb942351f13d2b178 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
All merge conflicts were simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/soc')
-rw-r--r--include/soc/arc/mcip.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/include/soc/arc/mcip.h b/include/soc/arc/mcip.h