git.monstr.eu Git - linux-2.6-microblaze.git/commit

projects / linux-2.6-microblaze.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	41804420586ab41049a14ab7ef04eaa2280b8647
tree	f05b39b0c5f1ed229b073f7a993ef717f9f1a363	tree
parent	7b1e46c5a265b142dd05ff3463fa3e0a1f4e4172	commit \| diff
parent	7d0d46da750a252371cb747b48ddda27d1047881	commit \| diff

Merge git://git./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>

MicroBlaze GIT Repository

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