From: David S. Miller <davem@davemloft.net>
Date: Tue, 13 May 2014 22:39:01 +0000 (-0400)
Subject: Merge branch 'tg3-next'
X-Git-Tag: omap-for-v3.16/fixes-against-rc1~36^2~236
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e1c77bfded1ee718eb14deac7ab474f6f1f3016;p=pandora-kernel.git

Merge branch 'tg3-next'

Michael Chan says:

====================
tg3: TSO related enhancements to prevent memory allocation failure

Michael Chan (3):
  tg3: Don't modify ip header fields when doing GSO
  tg3: Prevent page allocation failure during TSO workaround
  tg3: Update copyright and version to 3.137
====================

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

1e1c77bfded1ee718eb14deac7ab474f6f1f3016