tree f05b39b0c5f1ed229b073f7a993ef717f9f1a363
parent 7b1e46c5a265b142dd05ff3463fa3e0a1f4e4172
parent 7d0d46da750a252371cb747b48ddda27d1047881
author David S. Miller <davem@davemloft.net> 1390035341 -0800
committer David S. Miller <davem@davemloft.net> 1390035341 -0800

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>