Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Oct 2008 15:41:13 +0000 (08:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Oct 2008 15:41:13 +0000 (08:41 -0700)
commit6634160abfdbac39bd5ebda516b15b078a0f598e
tree85a570445d953f011b4d00595868f449ac652028
parent526719ba51e7d7bd31f7af9ab04b015b70096685
parent8b5f12d04b2e93842f3dda01f029842047bf3f81
Merge git://git./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