tree 57f5d78524bfd5e65aa9f3943da9c1a3e6ff65b7
parent cff63a52924c6a78fa525c67d81480c85736ff3c
parent 79f632c71bea0d0864d84d6a4ce78da5a9430f5b
author David S. Miller <davem@davemloft.net> 1367308254 -0400
committer David S. Miller <davem@davemloft.net> 1367308520 -0400

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

Conflicts:
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
	drivers/net/ethernet/emulex/benet/be.h
	include/net/tcp.h
	net/mac802154/mac802154.h

Most conflicts were minor overlapping stuff.

The be2net driver brought in some fixes that added __vlan_put_tag
calls, which in net-next take an additional argument.

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