kevin/linux
1
Fork 0
Code
d9bc125caf
linux/net
History
Trond Myklebust d9bc125caf Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ 
Conflicts:

	net/sunrpc/auth_gss/gss_krb5_crypto.c
	net/sunrpc/auth_gss/gss_spkm3_token.c
	net/sunrpc/clnt.c

Merge with mainline and fix conflicts.
2007-02-12 22:43:25 -08:00
..
802 [PATCH] mark struct file_operations const 7 2007-02-12 09:48:46 -08:00
8021q [PATCH] mark struct file_operations const 7 2007-02-12 09:48:46 -08:00
appletalk [PATCH] mark struct file_operations const 7 2007-02-12 09:48:46 -08:00
atm [PATCH] mark struct file_operations const 7 2007-02-12 09:48:46 -08:00
ax25 [PATCH] mark struct file_operations const 7 2007-02-12 09:48:46 -08:00
bluetooth [NET] BLUETOOTH: Fix whitespace errors. 2007-02-10 23:19:20 -08:00
bridge [NETFILTER]: nf_log: minor cleanups 2007-02-12 11:11:55 -08:00
core [PATCH] mark struct file_operations const 7 2007-02-12 09:48:46 -08:00
dccp [PATCH] mark struct file_operations const 7 2007-02-12 09:48:46 -08:00
decnet [PATCH] mark struct file_operations const 7 2007-02-12 09:48:46 -08:00
econet [NET] ECONET: Fix whitespace errors. 2007-02-10 23:19:32 -08:00
ethernet [NET] ETHERNET: Fix whitespace errors. 2007-02-10 23:19:34 -08:00
ieee80211 [NET] IEEE80211: Fix whitespace errors. 2007-02-10 23:19:36 -08:00
ipv4 [TCP]: cleanup of htcp (resend) 2007-02-12 13:34:03 -08:00
ipv6 [NETFILTER]: ip6t_mh: drop piggyback payload packet on MH packets 2007-02-12 11:16:17 -08:00
ipx [PATCH] mark struct file_operations const 7 2007-02-12 09:48:46 -08:00
irda [PATCH] mark struct file_operations const 8 2007-02-12 09:48:46 -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 [NET] LAPB: Fix whitespace errors. 2007-02-10 23:19:51 -08:00
llc [PATCH] mark struct file_operations const 8 2007-02-12 09:48:46 -08:00
netfilter [NETFILTER]: nf_conntrack_tcp: make sysctl variables static 2007-02-12 11:16:58 -08:00
netlabel [NET] NETLABEL: Fix whitespace errors. 2007-02-10 23:19:56 -08:00
netlink [PATCH] mark struct file_operations const 8 2007-02-12 09:48:46 -08:00
netrom [PATCH] mark struct file_operations const 8 2007-02-12 09:48:46 -08:00
packet [PATCH] mark struct file_operations const 8 2007-02-12 09:48:46 -08:00
rose [PATCH] mark struct file_operations const 8 2007-02-12 09:48:46 -08:00
rxrpc [PATCH] mark struct file_operations const 8 2007-02-12 09:48:46 -08:00
sched [PATCH] mark struct file_operations const 8 2007-02-12 09:48:46 -08:00
sctp [PATCH] mark struct file_operations const 8 2007-02-12 09:48:46 -08:00
sunrpc Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ 2007-02-12 22:43:25 -08:00
tipc [NET] TIPC: Fix whitespace errors. 2007-02-10 23:20:15 -08:00
unix [PATCH] mark struct file_operations const 8 2007-02-12 09:48:46 -08:00
wanrouter [PATCH] mark struct file_operations const 8 2007-02-12 09:48:46 -08:00
x25 [PATCH] mark struct file_operations const 8 2007-02-12 09:48:46 -08:00
xfrm [XFRM]: Fix OOPSes in xfrm_audit_log(). 2007-02-12 13:53:54 -08:00
compat.c [NET]: Fix whitespace errors. 2007-02-10 23:20:27 -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
nonet.c
socket.c [PATCH] mark struct file_operations const 8 2007-02-12 09:48:46 -08:00
sysctl_net.c
TUNABLE