From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 27 Oct 2008 15:41:13 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.28-rc3~98
X-Git-Url: https://repo.jachan.dev/J-linux.git/commitdiff_plain/6634160abfdbac39bd5ebda516b15b078a0f598e

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  syncookies: fix inclusion of tcp options in syn-ack
  libertas: free sk_buff with kfree_skb
  btsdio: free sk_buff with kfree_skb
  Phonet: do not reply to indication reset packets
  Phonet: include generic link-layer header size in MAX_PHONET_HEADER
---

6634160abfdbac39bd5ebda516b15b078a0f598e