Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Fri, 7 Nov 2014 03:01:18 +0000 (22:01 -0500)
committerDavid S. Miller <davem@davemloft.net>
Fri, 7 Nov 2014 03:01:18 +0000 (22:01 -0500)
1  2 
Documentation/networking/ip-sysctl.txt
drivers/net/ethernet/apm/xgene/xgene_enet_main.c
drivers/net/ethernet/sfc/ef10.c
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
net/dsa/slave.c
net/ipv4/geneve.c
net/ipv4/tcp_input.c
net/ipv6/ip6_gre.c
net/ipv6/ip6_tunnel.c
net/ipv6/ip6_vti.c
net/ipv6/sit.c

Simple merge
diff --cc net/dsa/slave.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/ipv6/sit.c
Simple merge