Merge branch 'tg3-next'
authorDavid S. Miller <davem@davemloft.net>
Tue, 13 May 2014 22:39:01 +0000 (18:39 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 13 May 2014 22:39:01 +0000 (18:39 -0400)
commit1e1c77bfded1ee718eb14deac7ab474f6f1f3016
tree2ad2a0d8d8a4f6fa769a12266fdda4a1f061039a
parentb6bd26c4de0141d0736a51487e4ca37390fcae03
parentde750e4c4bf36b8a14401527e6541e8620ea6267
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>