]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit92b1708520e24e00ecaf348d96f93bdec4ff9bdd
tree2ad2a0d8d8a4f6fa769a12266fdda4a1f061039a
parentd7c3df1856254b11380e45ecb5e980df3bb1bbf6
parentff401febd812542961aa93ea2211a0628a67c91a
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>