android_kernel_google_msm/net
James Morris 2b82892565 Merge branch 'master' into next
Conflicts:
	security/keys/internal.h
	security/keys/process_keys.c
	security/keys/request_key.c

Fixed conflicts above by using the non 'tsk' versions.

Signed-off-by: James Morris <jmorris@namei.org>
2008-11-14 11:29:12 +11:00
..
9p Merge branch 'master' into next 2008-11-14 11:29:12 +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
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 net: Fix disjunct computation of netdev features 2008-10-23 01:11:29 -07: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-11-14 11:29:12 +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
ieee80211
ipv4 Merge branch 'master' into next 2008-11-14 11:29:12 +11:00
ipv6 Merge branch 'master' into next 2008-11-14 11:29:12 +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 notify_mac function 2008-11-12 16:49:53 -05:00
netfilter Merge branch 'master' into next 2008-11-14 11:29:12 +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: do not reply to indication reset packets 2008-10-26 23:07:25 -07:00
rfkill Fix logic error in rfkill_check_duplicity 2008-11-06 16:37:09 -05:00
rose CRED: Wrap task credential accesses in the ROSE protocol 2008-11-14 10:39:08 +11:00
rxrpc CRED: Inaugurate COW credentials 2008-11-14 10:39:23 +11:00
sched CRED: Use creds in file structs 2008-11-14 10:39:25 +11:00
sctp sctp: Fix to handle SHUTDOWN in SHUTDOWN_RECEIVED state 2008-10-23 01:01:18 -07:00
sunrpc CRED: Wrap current->cred and a few other accessors 2008-11-14 10:39:18 +11:00
tipc
unix Merge branch 'master' into next 2008-11-14 11:29:12 +11:00
wanrouter
wireless wireless: fix regression caused by regulatory config option 2008-10-26 10:38:52 -07:00
x25
xfrm xfrm: Fix xfrm_policy_gc_lock handling. 2008-11-03 19:11:29 -08:00
compat.c net: put_cmsg_compat + SO_TIMESTAMP[NS]: use same name for value as caller 2008-11-12 01:54:56 -08:00
Kconfig
Makefile
nonet.c
socket.c CRED: Wrap task credential accesses in the networking subsystem 2008-11-14 10:39:10 +11:00
sysctl_net.c
TUNABLE