]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Tue, 15 Jan 2013 20:05:59 +0000 (15:05 -0500)
committerDavid S. Miller <davem@davemloft.net>
Tue, 15 Jan 2013 20:05:59 +0000 (15:05 -0500)
commit9557a0995ce6cf7d904c2ee67a842fa417d3831d
tree9cdfe30c6b96c47093da5392ed82d147290cd64c
parent088aa3d52bc7015ff40fd895b84da31a63d4158f
parent5772cfb8bedd4f93f23b70291bae083069b5719c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
Documentation/networking/ip-sysctl.txt
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

Both conflicts were simply overlapping context.

A build fix for qlcnic is in here too, simply removing the added
devinit annotations which no longer exist.

Signed-off-by: David S. Miller <davem@davemloft.net>
16 files changed:
Documentation/networking/ip-sysctl.txt
drivers/infiniband/hw/nes/nes.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
drivers/net/ethernet/broadcom/tg3.c
drivers/net/ethernet/nvidia/forcedeth.c
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
drivers/net/ethernet/qlogic/qlge/qlge_main.c
drivers/net/ethernet/xilinx/xilinx_axienet_main.c
drivers/net/wireless/mwifiex/cfg80211.c
include/linux/netdevice.h
net/bridge/br_netlink.c
net/core/dev.c
net/ipv4/tcp_input.c
net/ipv6/netfilter/ip6t_REJECT.c