summaryrefslogtreecommitdiff
path: root/dissector_eth.c
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2020-02-01 15:12:25 +0100
committerTobias Klauser <tklauser@distanz.ch>2020-02-01 15:12:41 +0100
commit61f7607328f30718daf27c8d1da2101c7ec30f9e (patch)
tree9e10eb2e77a951c1a20aed84a57098b241c66f99 /dissector_eth.c
parent17ea1053cc71feca63004318aeb7deaa0a99b5c4 (diff)
AUTHORS: update
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Diffstat (limited to 'dissector_eth.c')
0 files changed, 0 insertions, 0 deletions
te-remove&id=926af6273fc683cd98cd0ce7bf0d04a02eed6742'>926af6273fc683cd98cd0ce7bf0d04a02eed6742 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/netns/ipv6.h')