e0ada51db9
Conflicts were simple overlapping changes in microchip driver. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
Kconfig | ||
Makefile | ||
team.c | ||
team_mode_activebackup.c | ||
team_mode_broadcast.c | ||
team_mode_loadbalance.c | ||
team_mode_random.c | ||
team_mode_roundrobin.c |