summaryrefslogtreecommitdiffstats
path: root/net/socket.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-05-17 20:18:25 +0200
committerDavid S. Miller <davem@davemloft.net>2011-05-17 20:18:25 +0200
commit30b9284db3c77a5e20bb826cd1b66ed7b26cb726 (patch)
tree95557fc43645512f91670b2e07dc6fabcc0a31fe /net/socket.c
parentnet: use hlist_del_rcu() in dev_change_name() (diff)
parentnetfilter: nf_ct_sip: fix SDP parsing in TCP SIP messages for some Cisco phones (diff)
downloadlinux-30b9284db3c77a5e20bb826cd1b66ed7b26cb726.tar.xz
linux-30b9284db3c77a5e20bb826cd1b66ed7b26cb726.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'net/socket.c')
0 files changed, 0 insertions, 0 deletions