]> 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)
commitdf1d3e1c454bd092ab87d8d537cbb68fe21b3d43
tree2ad2a0d8d8a4f6fa769a12266fdda4a1f061039a
parent6a5cb8f5565a984c0cb4eeb3e4ed5c6d77cf78f8
parent8d9b9a920052c52d2f88dff5b373c0f4873f4191
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>