mirror of
https://github.com/hardkernel/linux.git
synced 2026-04-07 05:33:20 +09:00
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>