admin/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-12-07 20:06:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
b2ee7d46befc43e355ffaf7bfabb00e7a901b3a0
linux/net/ipv6/inet6_connection_sock.c
David S. Miller 4e8f2fc1a5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Two trivial overlapping changes conflicts in MPLS and mlx5.

Signed-off-by: David S. Miller <davem@davemloft.net>
2017-01-28 10:33:06 -05:00

4.3 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink