Skip to content
Commit 4e8f2fc1 authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 



Two trivial overlapping changes conflicts in MPLS and mlx5.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 158f323b 1b1bc42c
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment