git.ipfire.org Git - people/ms/linux.git/commit

]> git.ipfire.org Git - people/ms/linux.git/commit

projects / people / ms / linux.git / commit

author	David S. Miller <davem@davemloft.net>
	Tue, 15 Jan 2013 20:05:59 +0000 (15:05 -0500)
committer	David S. Miller <davem@davemloft.net>
	Tue, 15 Jan 2013 20:05:59 +0000 (15:05 -0500)
commit	4b87f922598acf91eee18f71688a33f54f57bcde
tree	9cdfe30c6b96c47093da5392ed82d147290cd64c	tree \| snapshot
parent	55eb555d9674e2ebe9d4de0146602f96ff18e7d6	commit \| diff
parent	daf3ec688e057f6060fb9bb0819feac7a8bbf45c	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/nes/nes.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/tg3.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/nvidia/forcedeth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qlge/qlge_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/xilinx/xilinx_axienet_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/cfg80211.c	diff1 \|	diff2 \|	blob \| history
include/linux/netdevice.h	diff1 \|	diff2 \|	blob \| history
net/bridge/br_netlink.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/netfilter/ip6t_REJECT.c	diff1 \|	diff2 \|	blob \| history

Michael's Linux tree.

RSS Atom

Documentation/networking/ip-sysctl.txt	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/nes/nes.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/tg3.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/nvidia/forcedeth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qlge/qlge_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/xilinx/xilinx_axienet_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/cfg80211.c	diff1 \|	diff2 \|	blob \| history
include/linux/netdevice.h	diff1 \|	diff2 \|	blob \| history
net/bridge/br_netlink.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/netfilter/ip6t_REJECT.c	diff1 \|	diff2 \|	blob \| history