From: David S. Miller <davem@davemloft.net>
Date: Tue, 12 Feb 2013 23:58:28 +0000 (-0500)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v3.12-rc1~1418^2~93
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9f6d98c298d48eec29a32ae8ed6f4d896eb4f634;p=kernel%2Fkernel-generic.git

Merge git://git./linux/kernel/git/davem/net

Conflicts:
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

The bnx2x gso_type setting bug fix in 'net' conflicted with
changes in 'net-next' that broke the gso_* setting logic
out into a seperate function, which also fixes the bug in
question.  Thus, use the 'net-next' version.

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

9f6d98c298d48eec29a32ae8ed6f4d896eb4f634