Patrick McHardy 1e4b105712 Merge branch 'master' of /repos/git/net-next-2.6 ...

Conflicts:
	net/bridge/br_device.c
	net/bridge/br_forward.c

Signed-off-by: Patrick McHardy <kaber@trash.net>

2010-05-10 18:39:28 +02:00

..

netfilter

Merge branch 'master' of /repos/git/net-next-2.6

2010-04-20 16:02:01 +02:00

addrconf_core.c

ipv6: Remove IPV6_ADDR_RESERVED

2010-02-26 03:59:07 -08:00

addrconf.c

net: rcu fixes

2010-05-03 15:53:54 -07:00

addrlabel.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

af_inet6.c

IPv6: Complete IPV6_DONTFRAG support

2010-04-23 23:35:29 -07:00

ah6.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

anycast.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

datagram.c

IPv6: Complete IPV6_DONTFRAG support

2010-04-23 23:35:29 -07:00

esp6.c

xfrm: SA lookups signature with mark

2010-02-22 16:20:22 -08:00

exthdrs_core.c

[NET] IPV6: Fix whitespace errors.

2007-02-10 23:19:42 -08:00

exthdrs.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

fib6_rules.c

net: rtnetlink: decouple rtnetlink address families from real address families

2010-04-26 16:13:54 +02:00

icmp.c

IPv6: Add dontfrag argument to relevant functions

2010-04-23 23:35:28 -07:00

inet6_connection_sock.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2010-05-02 22:02:06 -07:00

inet6_hashtables.c

tcp: Fix a connect() race with timewait sockets

2009-12-08 20:17:51 -08:00

ip6_fib.c

net: Fix various endianness glitches

2010-04-20 19:06:52 -07:00

ip6_flowlabel.c

IPv6: Add dontfrag argument to relevant functions

2010-04-23 23:35:28 -07:00

ip6_input.c

Merge branch 'master' of /repos/git/net-next-2.6

2010-04-20 16:02:01 +02:00

ip6_output.c

Merge branch 'master' of /repos/git/net-next-2.6

2010-05-10 18:39:28 +02:00

ip6_tunnel.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

ip6mr.c

Merge branch 'master' of /repos/git/net-next-2.6

2010-04-20 16:02:01 +02:00

ipcomp6.c

xfrm: SA lookups signature with mark

2010-02-22 16:20:22 -08:00

ipv6_sockglue.c

IPv6: Add dontfrag argument to relevant functions

2010-04-23 23:35:28 -07:00

Kconfig

IPv6: Fix 6RD typo

2009-10-07 14:50:30 -07:00

Makefile

[IPV6] MROUTE: Support multicast forwarding.

2008-04-05 22:33:38 +09:00

mcast.c

Merge branch 'master' of /repos/git/net-next-2.6

2010-05-10 18:39:28 +02:00

mip6.c

ipv6: drop unused "dev" arg of icmpv6_send()

2010-02-18 14:30:17 -08:00

ndisc.c

Merge branch 'master' of /repos/git/net-next-2.6

2010-04-20 16:02:01 +02:00

netfilter.c

netfilter: ipv6: move xfrm_lookup at end of ip6_route_me_harder

2010-04-15 12:37:18 +02:00

proc.c

icmp: Account for ICMP out errors

2010-04-03 15:09:04 -07:00

protocol.c

net: constify struct inet6_protocol

2009-09-14 17:03:05 -07:00

raw.c

Merge branch 'master' of /repos/git/net-next-2.6

2010-05-10 18:39:28 +02:00

reassembly.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

route.c

net: ipv6 bind to device issue

2010-04-21 22:59:24 -07:00

sit.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

syncookies.c

net: Add rtnetlink init_rcvwnd to set the TCP initial receive window

2009-12-23 14:13:30 -08:00

sysctl_net_ipv6.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

tcp_ipv6.c

IPv6: Generic TTL Security Mechanism (final version)

2010-04-22 15:24:53 -07:00

tunnel6.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

udp_impl.h

net: Make setsockopt() optlen be unsigned.

2009-09-30 16:12:20 -07:00

udp.c

ipv6: udp: make short packet logging consistent with ipv4

2010-05-06 21:50:17 -07:00

udplite.c

net: spread __net_init, __net_exit

2010-01-17 19:16:02 -08:00

xfrm6_input.c

netfilter: ipv6: use NFPROTO values for NF_HOOK invocation

2010-03-25 16:00:49 +01:00

xfrm6_mode_beet.c

ipsec: Interfamily IPSec BEET, ipv4-inner ipv6-outer

2008-08-06 02:40:25 -07:00

xfrm6_mode_ro.c

[IPSEC]: Make x->lastused an unsigned long

2008-01-28 14:53:52 -08:00

xfrm6_mode_transport.c

[IPSEC]: Use IPv6 calling convention as the convention for x->mode->output

2007-10-10 16:55:54 -07:00

xfrm6_mode_tunnel.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

xfrm6_output.c

netfilter: ipv6: use NFPROTO values for NF_HOOK invocation

2010-03-25 16:00:49 +01:00

xfrm6_policy.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2010-04-27 12:49:13 -07:00

xfrm6_state.c

ipv6: fix sparse warning: Using plain integer as NULL pointer

2009-02-21 23:37:10 -08:00

xfrm6_tunnel.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00