git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	David S. Miller <davem@davemloft.net>
	Sat, 18 Jan 2014 08:55:41 +0000 (00:55 -0800)
committer	David S. Miller <davem@davemloft.net>
	Sat, 18 Jan 2014 08:55:41 +0000 (00:55 -0800)
commit	662ee35cac80d92ef67da8f91861cd30ee54f3dc
tree	f05b39b0c5f1ed229b073f7a993ef717f9f1a363	tree \| snapshot
parent	b2b371e60e16129c4caee26e06ada05c9b7e7e50	commit \| diff
parent	228774a4574a4742423b0df4ee6579a379385d92	commit \| diff

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
net/ipv4/tcp_metrics.c

Overlapping changes between the "don't create two tcp metrics objects
with the same key" race fix in net and the addition of the destination
address in the lookup key in net-next.

Minor overlapping changes in bnx2x driver.

Signed-off-by: David S. Miller <davem@davemloft.net>

Linux Kernel Source Tree.

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/emulex/benet/be_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/e1000e/netdev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qlge/qlge_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/dm9601.c	diff1 \|	diff2 \|	blob \| history
include/net/if_inet6.h	diff1 \|	diff2 \|	blob \| history
net/batman-adv/main.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ipmr.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_metrics.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/addrconf.c	diff1 \|	diff2 \|	blob \| history