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

Conflicts:
	drivers/net/wireless/orinoco/main.c

2009-07-16 20:21:24 -07:00

..

netfilter

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

2009-06-11 16:00:49 +02:00

addrconf_core.c

…

addrconf.c

IPv6: preferred lifetime of address not getting updated

2009-07-03 19:10:13 -07:00

addrlabel.c

…

af_inet6.c

udpv6: Handle large incoming UDP/IPv6 packets and support software UFO

2009-07-12 14:29:29 -07:00

ah6.c

ipv6: Use correct data types for ICMPv6 type and code

2009-06-23 04:31:07 -07:00

anycast.c

…

datagram.c

…

esp6.c

ipv6: Use correct data types for ICMPv6 type and code

2009-06-23 04:31:07 -07:00

exthdrs_core.c

…

exthdrs.c

net: skb->dst accessors

2009-06-03 02:51:04 -07:00

fib6_rules.c

net: Remove unused parameter from fill method in fib_rules_ops.

2009-05-20 17:26:23 -07:00

icmp.c

ipv6: Use correct data types for ICMPv6 type and code

2009-06-23 04:31:07 -07:00

inet6_connection_sock.c

net: skb->dst accessors

2009-06-03 02:51:04 -07:00

inet6_hashtables.c

…

ip6_fib.c

…

ip6_flowlabel.c

…

ip6_input.c

ipv6: correct return on ipv6_rcv() packet drop

2009-07-06 18:07:55 -07:00

ip6_output.c

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

2009-07-16 20:21:24 -07:00

ip6_tunnel.c

net: use NETDEV_TX_OK instead of 0 in ndo_start_xmit() functions

2009-07-05 19:16:04 -07:00

ip6mr.c

net: use NETDEV_TX_OK instead of 0 in ndo_start_xmit() functions

2009-07-05 19:16:04 -07:00

ipcomp6.c

ipv6: Use correct data types for ICMPv6 type and code

2009-06-23 04:31:07 -07:00

ipv6_sockglue.c

…

Kconfig

trivial: Kconfig: .ko is normally not included in module names

2009-06-12 18:01:50 +02:00

Makefile

…

mcast.c

net: skb->dst accessors

2009-06-03 02:51:04 -07:00

mip6.c

ipv6: Use correct data types for ICMPv6 type and code

2009-06-23 04:31:07 -07:00

ndisc.c

net: skb->dst accessors

2009-06-03 02:51:04 -07:00

netfilter.c

net: skb->dst accessors

2009-06-03 02:51:04 -07:00

proc.c

…

protocol.c

…

raw.c

ipv6: Use correct data types for ICMPv6 type and code

2009-06-23 04:31:07 -07:00

reassembly.c

ipv6: Use frag list abstraction interfaces.

2009-06-09 00:20:05 -07:00

route.c

ipv6: Use correct data types for ICMPv6 type and code

2009-06-23 04:31:07 -07:00

sit.c

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

2009-07-16 20:21:24 -07:00

syncookies.c

…

sysctl_net_ipv6.c

…

tcp_ipv6.c

ipv6: Use correct data types for ICMPv6 type and code

2009-06-23 04:31:07 -07:00

tunnel6.c

ipv6: Use correct data types for ICMPv6 type and code

2009-06-23 04:31:07 -07:00

udp_impl.h

ipv6: Use correct data types for ICMPv6 type and code

2009-06-23 04:31:07 -07:00

udp.c

udpv6: Handle large incoming UDP/IPv6 packets and support software UFO

2009-07-12 14:29:29 -07:00

udplite.c

ipv6: Use correct data types for ICMPv6 type and code

2009-06-23 04:31:07 -07:00

xfrm6_input.c

…

xfrm6_mode_beet.c

…

xfrm6_mode_ro.c

…

xfrm6_mode_transport.c

…

xfrm6_mode_tunnel.c

net: skb->dst accessors

2009-06-03 02:51:04 -07:00

xfrm6_output.c

net: skb->dst accessors

2009-06-03 02:51:04 -07:00

xfrm6_policy.c

xfrm6: fix the proto and ports decode of sctp protocol

2009-07-03 19:10:10 -07:00

xfrm6_state.c

…

xfrm6_tunnel.c

ipv6: Use correct data types for ICMPv6 type and code

2009-06-23 04:31:07 -07:00