e5f2ef7ab4
Conflicts: drivers/net/ethernet/intel/e1000e/netdev.c Minor conflict in e1000e, a line that got fixed in 'net' has been removed in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
mlx4 | ||
Kconfig | ||
Makefile |