Linus Torvalds 5b3c1184e7 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		2007-03-06 19:53:34 -08:00
..
802	[PATCH] remove many unneeded #includes of sched.h	2007-02-14 08:09:54 -08:00
8021q	[VLAN]: Avoid a 4-order allocation.	2007-03-02 20:44:51 -08:00
appletalk	[PATCH] sysctl: remove insert_at_head from register_sysctl	2007-02-14 08:09:59 -08:00
atm	[PATCH] remove many unneeded #includes of sched.h	2007-02-14 08:09:54 -08:00
ax25	[PATCH] sysctl: remove insert_at_head from register_sysctl	2007-02-14 08:09:59 -08:00
bluetooth	[Bluetooth] Make use of device_move() for RFCOMM TTY devices	2007-02-26 11:42:41 -08:00
bridge	[BRIDGE]: Fix locking of set path cost.	2007-02-28 09:42:12 -08:00
core	[NET]: Fix compat_sock_common_getsockopt typo.	2007-03-06 13:44:06 -08:00
dccp	[DCCP]: Set RTO for newly created child socket	2007-03-06 14:24:44 -08:00
decnet	[PATCH] sysctl: remove the proc_dir_entry member for the sysctl tables	2007-02-14 08:10:00 -08:00
econet	[PATCH] remove many unneeded #includes of sched.h	2007-02-14 08:09:54 -08:00
ethernet	[PATCH] remove many unneeded #includes of sched.h	2007-02-14 08:09:54 -08:00
ieee80211	Merge branch 'upstream' into upstream-jgarzik	2007-02-17 18:26:09 -05:00
ipv4	Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2007-03-06 19:53:34 -08:00
ipv6	[NETFILTER]: ip6_route_me_harder should take into account mark	2007-03-05 13:25:27 -08:00
ipx	[IPX]: Remove ancient changelog	2007-02-28 09:42:06 -08:00
irda	[IRDA] net/irda/: proper prototypes	2007-02-26 11:42:43 -08:00
iucv	[S390]: Add AF_IUCV socket support	2007-02-08 13:51:54 -08:00
key	[XFRM]: Fix OOPSes in xfrm_audit_log().	2007-02-12 13:53:54 -08:00
lapb	[PATCH] remove many unneeded #includes of sched.h	2007-02-14 08:09:54 -08:00
llc	[PATCH] sysctl: remove insert_at_head from register_sysctl	2007-02-14 08:09:59 -08:00
netfilter	[NETFILTER]: nfnetlink_log: fix reference counting	2007-03-05 13:25:26 -08:00
netlabel	[NET]: Fix kfree(skb)	2007-02-28 09:42:14 -08:00
netlink	[PATCH] mark struct file_operations const 8	2007-02-12 09:48:46 -08:00
netrom	[PATCH] sysctl: remove insert_at_head from register_sysctl	2007-02-14 08:09:59 -08:00
packet	[AF_PACKET]: Remove unnecessary casts.	2007-02-26 11:42:45 -08:00
rose	[PATCH] sysctl: remove insert_at_head from register_sysctl	2007-02-14 08:09:59 -08:00
rxrpc	[PATCH] sysctl: remove insert_at_head from register_sysctl	2007-02-14 08:09:59 -08:00
sched	[PATCH] remove many unneeded #includes of sched.h	2007-02-14 08:09:54 -08:00
sctp	[SCTP]: Strike the transport before updating rto.	2007-02-26 11:42:50 -08:00
sunrpc	[PATCH] knfsd: provide sunrpc pool_mode module option	2007-03-06 09:30:26 -08:00
tipc	[NET] TIPC: Fix whitespace errors.	2007-02-10 23:20:15 -08:00
unix	[NET]: Revert incorrect accept queue backlog changes.	2007-03-06 11:21:05 -08:00
wanrouter	[PATCH] mark struct file_operations const 8	2007-02-12 09:48:46 -08:00
x25	[PATCH] sysctl: remove insert_at_head from register_sysctl	2007-02-14 08:09:59 -08:00
xfrm	[NET]: Fix kfree(skb)	2007-02-28 09:42:14 -08:00
Kconfig	[S390]: Rewrite of the IUCV base code, part 2	2007-02-08 13:37:42 -08:00
Makefile	[S390]: Rewrite of the IUCV base code, part 2	2007-02-08 13:37:42 -08:00
TUNABLE	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
compat.c	[PATCH] remove many unneeded #includes of sched.h	2007-02-14 08:09:54 -08:00
nonet.c	[PATCH] Make most file operations structs in fs/ const	2006-03-28 09:16:06 -08:00
socket.c	[PATCH] AUDIT_FD_PAIR	2007-02-17 21:30:15 -05:00
sysctl_net.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00