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
No related branches found
No related tags found
Showing
- drivers/bluetooth/btsdio.c 1 addition, 1 deletiondrivers/bluetooth/btsdio.c
- drivers/net/wireless/libertas/rx.c 1 addition, 1 deletiondrivers/net/wireless/libertas/rx.c
- include/linux/phonet.h 1 addition, 0 deletionsinclude/linux/phonet.h
- include/net/phonet/phonet.h 1 addition, 1 deletioninclude/net/phonet/phonet.h
- net/ipv4/tcp_output.c 5 additions, 5 deletionsnet/ipv4/tcp_output.c
- net/phonet/af_phonet.c 4 additions, 1 deletionnet/phonet/af_phonet.c
Loading
Please register or sign in to comment