Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Wed, 18 Dec 2013 21:42:06 +0000 (16:42 -0500)
committerDavid S. Miller <davem@davemloft.net>
Wed, 18 Dec 2013 21:42:06 +0000 (16:42 -0500)
commit143c9054949436cb05e468439dc5e46231f33d09
treec2e972d8188fb1b36368e9acb5b6b59466c9d903
parent0b6807034791160d5e584138943d2daea765436d
parent35eecf052250f663f07a4cded7d3503fd1b50729
Merge git://git./linux/kernel/git/davem/net

Conflicts:
drivers/net/ethernet/intel/i40e/i40e_main.c
drivers/net/macvtap.c

Both minor merge hassles, simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
33 files changed:
Documentation/networking/ip-sysctl.txt
MAINTAINERS
drivers/net/ethernet/broadcom/tg3.c
drivers/net/ethernet/freescale/fec_main.c
drivers/net/ethernet/intel/i40e/i40e_main.c
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
drivers/net/ethernet/smsc/smc91x.c
drivers/net/ethernet/ti/cpsw.c
drivers/net/hyperv/netvsc_drv.c
drivers/net/macvtap.c
drivers/net/phy/micrel.c
drivers/net/tun.c
drivers/net/vxlan.c
drivers/net/wireless/ath/ath9k/xmit.c
drivers/net/xen-netback/netback.c
include/linux/netdevice.h
include/net/sctp/structs.h
net/core/neighbour.c
net/ipv6/route.c
net/ipv6/tcp_ipv6.c
net/sched/sch_htb.c
net/sctp/associola.c
net/sctp/output.c
net/sctp/sm_statefuns.c
net/sctp/socket.c
net/sctp/sysctl.c
net/tipc/core.c
net/unix/af_unix.c