tree cca25bcae0cc6172a616335041c1e54a33db451c
parent 1afa471706963643ceeda7cbbe9c605a1e883d53
parent c3c7c254b2e8cd99b0adf288c2a1bddacd7ba255
author Linus Torvalds <torvalds@linux-foundation.org> 1354928457 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1354928457 -0800

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Pull networking fixes from David Miller:
 "Two stragglers:

   1) The new code that adds new flushing semantics to GRO can cause SKB
      pointer list corruption, manage the lists differently to avoid the
      OOPS.  Fix from Eric Dumazet.

   2) When TCP fast open does a retransmit of data in a SYN-ACK or
      similar, we update retransmit state that we shouldn't triggering a
      WARN_ON later.  Fix from Yuchung Cheng."

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
  net: gro: fix possible panic in skb_gro_receive()
  tcp: bug fix Fast Open client retransmission