Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Tue, 14 Jan 2014 22:37:09 +0000 (14:37 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 14 Jan 2014 22:42:42 +0000 (14:42 -0800)
commit0a379e21c503b2ff66b44d588df9f231e9b0b9ca
tree22b875fcf4b67fcd007726f00c5fc1748ce985d0
parenta49da8811e71c5355b52c65ee32976741d5834cd
parentfdc3452cd2c7b2bfe0f378f92123f4f9a98fa2bd
Merge git://git./linux/kernel/git/davem/net
28 files changed:
MAINTAINERS
drivers/net/bonding/bond_main.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
drivers/net/ethernet/lantiq_etop.c
drivers/net/ethernet/mellanox/mlx4/en_tx.c
drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
drivers/net/ethernet/tile/tilegx.c
drivers/net/macvlan.c
drivers/net/tun.c
drivers/net/usb/usbnet.c
drivers/net/wireless/iwlwifi/pcie/drv.c
drivers/net/wireless/mac80211_hwsim.c
drivers/net/wireless/mwifiex/main.c
include/linux/netdevice.h
net/core/dev.c
net/core/flow_dissector.c
net/ipv6/addrconf.c
net/ipv6/ip6_vti.c
net/mac80211/iface.c
net/mac80211/tx.c
net/nfc/core.c
net/sched/sch_generic.c
net/tipc/link.c