0b42f25d2f
udplite conflict is resolved by taking what 'net-next' did which removed the backlog receive method assignment, since it is no longer necessary. Two entries were added to the non-priv ethtool operations switch statement, one in 'net' and one in 'net-next, so simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
Kconfig | ||
Makefile | ||
adf7242.c | ||
at86rf230.c | ||
at86rf230.h | ||
atusb.c | ||
atusb.h | ||
cc2520.c | ||
fakelb.c | ||
mrf24j40.c |