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	…
8021q	…
appletalk	…
atm	…
ax25	…
bluetooth	…
bridge	bridge: netfilter: fix update_pmtu crash with GRE	2008-11-24 16:06:50 -08:00
can	…
core	Merge branch 'master' into next	2008-12-04 17:16:36 +11:00
dccp	…
decnet	…
dsa	…
econet	…
ethernet	…
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	…
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	…
netlink	…
netrom	…
packet	…
phonet	Phonet: fix oops in phonet_address_del() on non-Phonet device	2008-11-26 15:26:43 -08:00
rfkill	…
rose	Merge branch 'master' into next	2008-12-04 17:16:36 +11:00
rxrpc	…
sched	Merge branch 'master' into next	2008-12-04 17:16:36 +11:00
sctp	…
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	…
Kconfig	…
Makefile	…
TUNABLE	…
compat.c	reintroduce accept4	2008-11-19 18:49:57 -08:00
nonet.c	…
socket.c	Merge branch 'master' into next	2008-12-04 17:16:36 +11:00
sysctl_net.c	…