James Morris ec98ce480a Merge branch 'master' into next ... Conflicts: fs/nfsd/nfs4recover.c Manually fixed above to use new creds API functions, e.g. nfs4_save_creds(). Signed-off-by: James Morris <jmorris@namei.org>		2008-12-04 17:16:36 +11:00
..
9p	Merge branch 'master' into next	2008-11-18 18:52:37 +11:00
802	net/802/fc.c: Fix compilation warnings	2008-10-15 00:13:53 -07:00
8021q	vlan: Fix typos in proc output string	2008-11-10 13:37:40 -08:00
appletalk	net: Rationalise email address: Network Specific Parts	2008-10-13 19:01:08 -07:00
atm
ax25	CRED: Wrap task credential accesses in the AX25 protocol	2008-11-14 10:39:06 +11:00
bluetooth	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2008-10-17 08:58:52 -07:00
bridge	bridge: netfilter: fix update_pmtu crash with GRE	2008-11-24 16:06:50 -08:00
can	net: Remove CONFIG_KMOD from net/ (towards removing CONFIG_KMOD entirely)	2008-10-16 15:24:51 -07:00
core	Merge branch 'master' into next	2008-12-04 17:16:36 +11:00
dccp	dccp: Port redirection support for DCCP	2008-10-19 23:36:47 -07:00
decnet	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2008-10-17 08:58:52 -07:00
dsa	dsa: fix master interface allmulti/promisc handling	2008-11-10 21:53:12 -08:00
econet
ethernet	dsa: add support for Trailer tagging format	2008-10-08 17:24:16 -07:00
ieee80211
ipv4	Merge branch 'master' into next	2008-12-04 17:16:36 +11:00
ipv6	Merge branch 'master' into next	2008-12-04 17:16:36 +11:00
ipx
irda
iucv
key	af_key: mark policy as dead before destroying	2008-11-06 23:08:37 -08:00
lapb
llc
mac80211	mac80211 : Fix setting ad-hoc mode and non-ibss channel	2008-11-25 16:13:08 -05:00
netfilter	Merge branch 'master' into next	2008-12-04 17:16:36 +11:00
netlabel	netlabel: Fix compilation warnings in net/netlabel/netlabel_addrlist.c	2008-10-30 10:44:48 -04:00
netlink	net: Remove CONFIG_KMOD from net/ (towards removing CONFIG_KMOD entirely)	2008-10-16 15:24:51 -07:00
netrom	CRED: Wrap task credential accesses in the netrom protocol	2008-11-14 10:39:08 +11:00
packet
phonet	Phonet: fix oops in phonet_address_del() on non-Phonet device	2008-11-26 15:26:43 -08:00
rfkill	Fix logic error in rfkill_check_duplicity	2008-11-06 16:37:09 -05:00
rose	Merge branch 'master' into next	2008-12-04 17:16:36 +11:00
rxrpc	CRED: Inaugurate COW credentials	2008-11-14 10:39:23 +11:00
sched	Merge branch 'master' into next	2008-12-04 17:16:36 +11:00
sctp	sctp: Fix to handle SHUTDOWN in SHUTDOWN_RECEIVED state	2008-10-23 01:01:18 -07:00
sunrpc	Merge branch 'master' into next	2008-12-04 17:16:36 +11:00
tipc
unix	Merge branch 'master' into next	2008-12-04 17:16:36 +11:00
wanrouter
wireless	net/wireless/reg.c: fix bad WARN_ON in if statement	2008-11-25 16:13:09 -05:00
x25
xfrm	xfrm: Fix xfrm_policy_gc_lock handling.	2008-11-03 19:11:29 -08:00
compat.c	reintroduce accept4	2008-11-19 18:49:57 -08:00
Kconfig	net: Distributed Switch Architecture protocol support	2008-10-08 17:15:19 -07:00
Makefile	net: Distributed Switch Architecture protocol support	2008-10-08 17:15:19 -07:00
nonet.c
socket.c	Merge branch 'master' into next	2008-12-04 17:16:36 +11:00
sysctl_net.c
TUNABLE