Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Sun, 30 Nov 2014 04:47:48 +0000 (20:47 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sun, 30 Nov 2014 04:47:48 +0000 (20:47 -0800)
commit60b7379dc5b1743427b031cca53e30860a38ada6
treec0462b8dd188861bd04f36dd31672b7446e35dd8
parenta523a5ecc8c6ddceb8f783f600605553e5ad8963
parent7a5a4f978750756755dc839014e13d1b088ccc8e
Merge git://git./linux/kernel/git/davem/net
20 files changed:
MAINTAINERS
drivers/net/ethernet/broadcom/tg3.c
drivers/net/ethernet/emulex/benet/be_main.c
drivers/net/ethernet/intel/igb/igb_main.c
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
drivers/net/vxlan.c
drivers/net/wireless/iwlwifi/iwl-fw.h
drivers/net/wireless/iwlwifi/mvm/mac80211.c
net/bridge/br_netlink.c
net/ipv4/af_inet.c
net/ipv4/ping.c
net/ipv4/tcp.c
net/ipv4/tcp_ipv4.c
net/ipv6/ip6_gre.c
net/ipv6/ip6_offload.c
net/ipv6/ip6_vti.c
net/ipv6/tcp_ipv6.c
net/packet/af_packet.c