aboutsummaryrefslogtreecommitdiffstats
path: root/include/net
Commit message (Expand)AuthorAgeFilesLines
* Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2006-12-072-5/+21
|\
| * audit: disable ipsec auditing when CONFIG_AUDITSYSCALL=nJoy Latten2006-12-061-1/+6
| * audit: Add auditing to ipsecJoy Latten2006-12-061-5/+14
| * [IRDA] irlan: Fix compile warning when CONFIG_PROC_FS=nRandy Dunlap2006-12-061-0/+2
* | [PATCH] lockdep: annotate nfs/nfsd in-kernel socketsPeter Zijlstra2006-12-071-0/+19
* | [PATCH] slab: remove kmem_cache_tChristoph Lameter2006-12-077-9/+9
* | [PATCH] slab: remove SLAB_ATOMICChristoph Lameter2006-12-071-1/+1
|/
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval...David Howells2006-12-056-0/+6
|\
| * [PATCH] severing skbuff.h -> mm.hAl Viro2006-12-044-0/+4
| * [PATCH] severing skbuff.h -> poll.hAl Viro2006-12-042-0/+2
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval...David Howells2006-12-0565-473/+1442
|\ \ | |/
| * [NETFILTER]: nf_conntrack/nf_nat: add PPTP helper portPatrick McHardy2006-12-024-0/+14
| * [NETFILTER]: nf_conntrack/nf_nat: add H.323 helper portPatrick McHardy2006-12-022-0/+3
| * [NETFILTER]: nf_conntrack: add helper function for expectation initializationPatrick McHardy2006-12-022-7/+7
| * [NETFILTER]: nf_nat: add FTP NAT helper portJozsef Kadlecsik2006-12-021-1/+1
| * [NETFILTER]: Add NAT support for nf_conntrackJozsef Kadlecsik2006-12-028-15/+277
| * [NETFILTER]: nf_conntrack: automatic helper assignment for expectationsPatrick McHardy2006-12-021-0/+3
| * [NETFILTER]: nf_conntrack: endian annotationsPatrick McHardy2006-12-021-9/+9
| * [NETFILTER]: nf_conntrack: fix helper structure alignmentPatrick McHardy2006-12-021-0/+1
| * [GENETLINK]: Add cmd dump completion.Jamal Hadi Salim2006-12-021-0/+2
| * [IPSEC]: Add encapsulation family.Miika Komu2006-12-021-0/+2
| * [NET_SCHED]: Fix endless loops caused by inaccurate qlen counters (part 1)Patrick McHardy2006-12-021-0/+2
| * [NET_SCHED]: Set parent classid in default qdiscsPatrick McHardy2006-12-021-1/+1
| * NetLabel: convert to an extensibile/sparse category bitmapPaul Moore2006-12-021-3/+99
| * [NETFILTER]: conntrack: add '_get' to {ip, nf}_conntrack_expect_findYasuyuki Kozakai2006-12-021-1/+1
| * [NETFILTER]: nf_conntrack: /proc compatibility with old connection trackingPatrick McHardy2006-12-021-0/+3
| * [NETFILTER]: nf_conntrack: sysctl compatibility with old connection trackingPatrick McHardy2006-12-021-1/+5
| * [NETFILTER]: nf_conntrack: automatic sysctl registation for conntrack protocolsPatrick McHardy2006-12-022-0/+12
| * [NETFILTER]: nf_conntrack: move extern declaration to header filesPatrick McHardy2006-12-023-0/+34
| * [NETFILTER]: nf_conntrack: remove unused struct list_head from protocolsMartin Josefsson2006-12-022-6/+0
| * [NETFILTER]: nf_conntrack: more sanity checks in protocol registration/unregi...Martin Josefsson2006-12-022-2/+2
| * [NETFILTER]: nf_conntrack: rename struct nf_conntrack_protocolMartin Josefsson2006-12-023-25/+25
| * [NETFILTER]: nf_conntrack: split out the event cacheMartin Josefsson2006-12-023-81/+96
| * [NETFILTER]: nf_conntrack: split out helper handlingMartin Josefsson2006-12-022-0/+12
| * [NETFILTER]: nf_conntrack: split out expectation handlingMartin Josefsson2006-12-024-58/+80
| * [INET]: Change protocol field in struct inet_protosw to u16Arnaldo Carvalho de Melo2006-12-021-1/+1
| * [XFRM]: Pack struct xfrm_policyArnaldo Carvalho de Melo2006-12-021-6/+7
| * [INET_CONNECTION_SOCK]: Pack struct inet_connection_sock_af_opsArnaldo Carvalho de Melo2006-12-021-2/+2
| * [UDP(-Lite)]: consolidate v4 and v6 get|setsockopt codeGerrit Renker2006-12-021-0/+5
| * [DECNET] address: Convert to new netlink interfaceThomas Graf2006-12-021-0/+12
| * [NET]: net/sched annotations.Al Viro2006-12-021-1/+1
| * [NET]: Fix assorted misannotations (from md5 and udplite merges).Al Viro2006-12-023-4/+4
| * [SCTP]: SCTP_CMD_PROCESS_CTSN annotations.Al Viro2006-12-021-0/+2
| * [SCTP]: Annotate ->supported_addrs().Al Viro2006-12-021-1/+1
| * [SCTP]: sctp_association ->peer.i is a host-endian analog of sctp_inthdr.Al Viro2006-12-021-1/+8
| * [SCTP]: Annotate ->inaddr_any().Al Viro2006-12-021-1/+1
| * [SCTP]: flip_to_{h,n}() are not needed anymore.Al Viro2006-12-021-22/+0
| * [SCTP]: ->a_h is gone now.Al Viro2006-12-021-1/+0
| * [SCTP]: ->a_h is gone now.Al Viro2006-12-021-1/+0
| * [SCTP]: ->source_h is not used anymore.Al Viro2006-12-021-1/+0