mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-27 14:43:58 +08:00
0ddead90b2
The conflicts were two cases of overlapping changes in batman-adv and the qed driver. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
Kconfig | ||
Makefile | ||
team_mode_activebackup.c | ||
team_mode_broadcast.c | ||
team_mode_loadbalance.c | ||
team_mode_random.c | ||
team_mode_roundrobin.c | ||
team.c |