mirror of
https://github.com/torvalds/linux
synced 2024-10-20 10:19:54 +00:00
d31e95585c
The only slightly tricky merge conflict was the netdevsim because the mutex locking fix overlapped a lot of driver reload reorganization. The rest were (relatively) trivial in nature. 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 |