diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-07 03:53:34 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-07 03:53:34 (GMT) |
| commit | 5b3c1184e78dd7d74eced83b25af88cf1d13e686 (patch) | |
| tree | 2a172026fc3492a9cdd66bca1e57d019eb78bf28 /net/Makefile | |
| parent | fe1b4ba400193176213f95be3ea711a53518a609 (diff) | |
| parent | 99c72ce091ec85868a0847e598eb7562dc0d8205 (diff) | |
| download | linux-5b3c1184e78dd7d74eced83b25af88cf1d13e686.tar.xz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[DCCP]: Set RTO for newly created child socket
[DCCP]: Correctly split CCID half connections
[NET]: Fix compat_sock_common_getsockopt typo.
[NET]: Revert incorrect accept queue backlog changes.
[INET]: twcal_jiffie should be unsigned long, not int
[GIANFAR]: Fix compile error in latest git
[PPPOE]: Use ifindex instead of device pointer in key lookups.
[NETFILTER]: ip6_route_me_harder should take into account mark
[NETFILTER]: nfnetlink_log: fix reference counting
[NETFILTER]: nfnetlink_log: fix module reference counting
[NETFILTER]: nfnetlink_log: fix possible NULL pointer dereference
[NETFILTER]: nfnetlink_log: fix NULL pointer dereference
[NETFILTER]: nfnetlink_log: fix use after free
[NETFILTER]: nfnetlink_log: fix reference leak
[NETFILTER]: tcp conntrack: accept SYN|URG as valid
[NETFILTER]: nf_conntrack/nf_nat: fix incorrect config ifdefs
[NETFILTER]: conntrack: fix {nf,ip}_ct_iterate_cleanup endless loops
Diffstat (limited to 'net/Makefile')
0 files changed, 0 insertions, 0 deletions