-
git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller authored
Conflicts: net/dsa/slave.c net/dsa/slave.c simply had overlapping changes. Signed-off-by:David S. Miller <davem@davemloft.net>
f6d3125f
Conflicts:
net/dsa/slave.c
net/dsa/slave.c simply had overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>