You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Linus Torvalds a57793651f Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (51 commits) [IPV6]: Fix again the fl6_sock_lookup() fixed locking [NETFILTER]: nf_conntrack_tcp: fix connection reopening fix [IPV6]: Fix race in ipv6_flowlabel_opt() when inserting two labels [IPV6]: Lost locking in fl6_sock_lookup [IPV6]: Lost locking when inserting a flowlabel in ipv6_fl_list [NETFILTER]: xt_sctp: fix mistake to pass a pointer where array is required [NET]: Fix OOPS due to missing check in dev_parse_header(). [TCP]: Remove lost_retrans zero seqno special cases [NET]: fix carrier-on bug? [NET]: Fix uninitialised variable in ip_frag_reasm() [IPSEC]: Rename mode to outer_mode and add inner_mode [IPSEC]: Disallow combinations of RO and AH/ESP/IPCOMP [IPSEC]: Use the top IPv4 route's peer instead of the bottom [IPSEC]: Store afinfo pointer in xfrm_mode [IPSEC]: Add missing BEET checks [IPSEC]: Move type and mode map into xfrm_state.c [IPSEC]: Fix length check in xfrm_parse_spi [IPSEC]: Move ip_summed zapping out of xfrm6_rcv_spi [IPSEC]: Get nexthdr from caller in xfrm6_rcv_spi [IPSEC]: Move tunnel parsing for IPv4 out of xfrm4_input ...		18 years ago
..
9p	9p: remove sysctl	18 years ago
802	…
8021q	…
appletalk	…
atm	[BR2684]: get rid of broken header code.	18 years ago
ax25	…
bluetooth	…
bridge	…
core	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	18 years ago
dccp	[DCCP]: fix link error with !CONFIG_SYSCTL	18 years ago
decnet	…
econet	…
ethernet	…
ieee80211	[PATCH] ieee80211: fix TKIP QoS bug	18 years ago
ipv4	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	18 years ago
ipv6	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	18 years ago
ipx	…
irda	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	18 years ago
iucv	…
key	…
lapb	…
llc	…
mac80211	[MAC80211]: only honor IW_SCAN_THIS_ESSID in STA, IBSS, and AP modes	18 years ago
netfilter	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	18 years ago
netlabel	…
netlink	…
netrom	…
packet	…
rfkill	…
rose	…
rxrpc	KEYS: Make request_key() and co fundamentally asynchronous	18 years ago
sched	[NET]: fix carrier-on bug?	18 years ago
sctp	Remove "unsafe" from module struct	18 years ago
sunrpc	sysctl: remove broken sunrpc debug binary sysctls	18 years ago
tipc	…
unix	…
wanrouter	…
wireless	…
x25	…
xfrm	[IPSEC]: Rename mode to outer_mode and add inner_mode	18 years ago
Kconfig	…
Makefile	…
TUNABLE	…
compat.c	…
nonet.c	…
socket.c	r/o bind mounts: filesystem helpers for custom 'struct file's	18 years ago
sysctl_net.c	…