Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Thu, 31 Dec 2015 23:20:10 +0000 (18:20 -0500)
committerDavid S. Miller <davem@davemloft.net>
Thu, 31 Dec 2015 23:20:10 +0000 (18:20 -0500)
commitc07f30ad68053181b3e8a0e65b0630e12e844f91
tree8758968aabc844c435ff2a5d7d02c835fccd02a3
parent7b22a7788b0263f42f7232c5c05c503424ffa0ba
parent9c982e86dbdbaa3fb248dfc776dddda32cbc8927
Merge git://git./linux/kernel/git/davem/net
18 files changed:
MAINTAINERS
crypto/algif_skcipher.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
drivers/net/ethernet/emulex/benet/be.h
drivers/net/ethernet/emulex/benet/be_main.c
drivers/net/ethernet/mellanox/mlx4/en_netdev.c
drivers/net/ethernet/renesas/sh_eth.c
drivers/net/ethernet/ti/cpsw.c
drivers/net/geneve.c
drivers/net/usb/cdc_ncm.c
drivers/net/wireless/intel/iwlwifi/iwl-7000.c
drivers/net/wireless/intel/iwlwifi/mvm/sta.c
lib/rhashtable.c
net/bridge/br_stp_if.c
net/ipv4/ipip.c
net/ipv6/addrconf.c
net/openvswitch/conntrack.c
net/sctp/socket.c