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

..

netfilter

CRED: Use creds in file structs

2008-11-14 10:39:25 +11:00

addrconf_core.c

…

addrconf.c

ipv6: fix run pending DAD when interface becomes ready

2008-11-05 01:43:57 -08:00

addrlabel.c

…

af_inet6.c

…

ah6.c

…

anycast.c

…

datagram.c

…

esp6.c

…

exthdrs_core.c

…

exthdrs.c

…

fib6_rules.c

…

icmp.c

…

inet6_connection_sock.c

…

inet6_hashtables.c

…

ip6_fib.c

…

ip6_flowlabel.c

CRED: Wrap task credential accesses in the IPv6 protocol

2008-11-14 10:39:07 +11:00

ip6_input.c

…

ip6_output.c

…

ip6_tunnel.c

…

ip6mr.c

ipv6: fix ip6_mr_init error path

2008-11-10 16:34:11 -08:00

ipcomp6.c

…

ipv6_sockglue.c

…

Kconfig

…

Makefile

…

mcast.c

…

mip6.c

…

ndisc.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

2008-10-16 11:26:26 -07:00

netfilter.c

…

proc.c

…

protocol.c

…

raw.c

…

reassembly.c

…

route.c

…

sit.c

…

syncookies.c

tcp: Fix IPv6 fallout from 'Port redirection support for TCP'

2008-10-19 23:35:58 -07:00

sysctl_net_ipv6.c

…

tcp_ipv6.c

tcp: Fix IPv6 fallout from 'Port redirection support for TCP'

2008-10-19 23:35:58 -07:00

tunnel6.c

…

udp_impl.h

…

udp.c

udp: Fix the SNMP counter of UDP_MIB_INERRORS

2008-11-02 23:52:46 -08:00

udplite.c

…

xfrm6_input.c

…

xfrm6_mode_beet.c

…

xfrm6_mode_ro.c

…

xfrm6_mode_transport.c

…

xfrm6_mode_tunnel.c

…

xfrm6_output.c

…

xfrm6_policy.c

…

xfrm6_state.c

xfrm: Have af-specific init_tempsel() initialize family field of temporary selector

2008-11-04 14:49:19 -08:00

xfrm6_tunnel.c

…