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	c12885c71e8f3d4a36631b81738c24a16de98f2c
tree	f05b39b0c5f1ed229b073f7a993ef717f9f1a363	tree \| snapshot
parent	fae212feb6ba47fee6d862240561ae9442be328f	commit \| diff
parent	d180d1f07f4346b19daa4001a465d2b9e055cc43	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