aboutsummaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval...David Howells2006-12-0521-148/+314
|\
| * Merge branch 'for-linus4' of master.kernel.org:/pub/scm/linux/kernel/git/viro...Linus Torvalds2006-12-0416-1/+35
| |\
| | * [PATCH] severing skbuff.h -> mm.hAl Viro2006-12-0410-0/+10
| | * [PATCH] severing skbuff.h -> highmem.hAl Viro2006-12-046-1/+25
| * | Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6David S. Miller2006-12-034-139/+237
| |\ \
| | * | [DCCP] tfrc: Binary search for reverse TFRC lookupGerrit Renker2006-12-031-14/+24
| | * | [DCCP] ccid3: Deprecate TFRC_SMALLEST_PGerrit Renker2006-12-032-18/+6
| | * | [DCCP] tfrc: Identify TFRC table limits and simplify codeGerrit Renker2006-12-031-9/+18
| | * | [DCCP] tfrc: Add protection against invalid parameters to TFRC routinesGerrit Renker2006-12-031-14/+19
| | * | [DCCP] tfrc: Fix small error in reverse lookup of p for given f(p)Gerrit Renker2006-12-031-2/+2
| | * | [DCCP] tfrc: Document boundaries and limits of the TFRC lookup tableGerrit Renker2006-12-031-56/+88
| | * | [DCCP] ccid3: Fix warning message about illegal ACKGerrit Renker2006-12-031-1/+2
| | * | [DCCP] ccid3: Fix bug in calculation of send rateGerrit Renker2006-12-031-37/+52
| | * | [DCCP]: Fix BUG in retransmission delay calculationGerrit Renker2006-12-031-1/+1
| | * | [DCCP]: Use higher RTO default for CCID3Gerrit Renker2006-12-032-8/+46
| | |/
| * | [XFRM] xfrm_user: Better validation of user templates.David S. Miller2006-12-031-8/+42
| |/
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval...David Howells2006-12-05364-7798/+21212
|\ \ | |/
| * [XFRM]: Fix aevent structuring to be more complete.Jamal Hadi Salim2006-12-021-1/+3
| * [NETFILTER]: xtables: fixes warning on compilation of hashlimitYasuyuki Kozakai2006-12-021-1/+1
| * [ROSE] rose_add_loopback_node: propagate -EAlexey Dobriyan2006-12-021-2/+2
| * [NETFILTER]: nf_conntrack: fix header inclusions for helpersYasuyuki Kozakai2006-12-025-4/+4
| * [NETFILTER]: nf_conntrack: EXPORT_SYMBOL cleanupPatrick McHardy2006-12-0210-86/+75
| * [NETFILTER]: Mark old IPv4-only connection tracking scheduled for removalPatrick McHardy2006-12-023-5/+5
| * [NETFILTER]: nf_nat: add SNMP NAT helper portPatrick McHardy2006-12-023-0/+1348
| * [NETFILTER]: nf_conntrack/nf_nat: add TFTP helper portPatrick McHardy2006-12-026-0/+229
| * [NETFILTER]: nf_conntrack/nf_nat: add SIP helper portPatrick McHardy2006-12-026-0/+832
| * [NETFILTER]: nf_conntrack/nf_nat: add PPTP helper portPatrick McHardy2006-12-029-0/+1449
| * [NETFILTER]: nf_conntrack: add NetBIOS name service helper portPatrick McHardy2006-12-023-0/+145
| * [NETFILTER]: nf_conntrack/nf_nat: add IRC helper portPatrick McHardy2006-12-026-0/+404
| * [NETFILTER]: nf_conntrack/nf_nat: add H.323 helper portPatrick McHardy2006-12-028-6/+2487
| * [NETFILTER]: nf_conntrack/nf_nat: add amanda helper portPatrick McHardy2006-12-026-0/+337
| * [NETFILTER]: nf_conntrack: add helper function for expectation initializationPatrick McHardy2006-12-021-0/+68
| * [NETFILTER]: nf_nat: add FTP NAT helper portJozsef Kadlecsik2006-12-024-19/+210
| * [NETFILTER]: Add NAT support for nf_conntrackJozsef Kadlecsik2006-12-0220-43/+2389
| * [NETFILTER]: nf_conntrack: add module aliases to IPv4 conntrack namesPatrick McHardy2006-12-024-0/+4
| * [NETFILTER]: Kconfig: improve conntrack selectionPatrick McHardy2006-12-022-20/+44
| * [NETFILTER]: nf_conntrack: automatic helper assignment for expectationsPatrick McHardy2006-12-024-6/+18
| * [NETFILTER]: nf_conntrack: endian annotationsPatrick McHardy2006-12-0210-56/+49
| * [NETFILTER]: nf_conntrack: fix helper structure alignmentPatrick McHardy2006-12-021-4/+5
| * [NETFILTER]: nf_conntrack: fix NF_CONNTRACK_PROC_COMPAT dependencyPatrick McHardy2006-12-021-1/+1
| * [NET]: Accept wildcard delimiters in in[46]_ptonPatrick McHardy2006-12-021-4/+6
| * [PKT_SCHED] act_gact: division by zeroKim Nordlund2006-12-021-2/+2
| * [GENETLINK]: Add cmd dump completion.Jamal Hadi Salim2006-12-021-1/+1
| * [ATM]: Kill ipcommon.[ch]David S. Miller2006-12-025-98/+47
| * [NET_SCHED]: policer: restore compatibility with old iproute binariesPatrick McHardy2006-12-021-4/+22
| * [PKT_SCHED]: Remove unused exports.Adrian Bunk2006-12-022-4/+0
| * [EBTABLES]: Split ebt_replace into user and kernel variants, annotate.Al Viro2006-12-024-12/+13
| * [EBTABLES]: Clean ebt_register_table() up.Al Viro2006-12-021-12/+21
| * [EBTABLES]: Move calls of ebt_verify_pointers() upstream.Al Viro2006-12-021-9/+11
| * [EBTABLES]: ebt_check_entry() doesn't need valid_hooksAl Viro2006-12-021-4/+3