| commit | 6634160abfdbac39bd5ebda516b15b078a0f598e | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Oct 27 08:41:13 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Oct 27 08:41:13 2008 -0700 |
| tree | 85a570445d953f011b4d00595868f449ac652028 | |
| parent | 526719ba51e7d7bd31f7af9ab04b015b70096685 [diff] | |
| parent | 8b5f12d04b2e93842f3dda01f029842047bf3f81 [diff] |
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