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

Conflicts:

	drivers/net/smc911x.c

2008-06-13 20:52:39 -07:00

..

ipvs

net: remove CVS keywords

2008-06-11 21:00:38 -07:00

netfilter

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

2008-06-13 20:52:39 -07:00

af_inet.c

net: remove CVS keywords

2008-06-11 21:00:38 -07:00

ah4.c

[IPSEC]: Fix bogus usage of u64 on input sequence number

2008-02-12 22:50:35 -08:00

arp.c

net: remove CVS keywords

2008-06-11 21:00:38 -07:00

cipso_ipv4.c

cipso: Relax too much careful cipso hash function.

2008-05-13 23:23:55 -07:00

datagram.c

…

devinet.c

net: remove CVS keywords

2008-06-11 21:00:38 -07:00

esp4.c

[ESP]: Ensure IV is in linear part of the skb to avoid BUG() due to OOB access

2008-03-27 16:08:03 -07:00

fib_frontend.c

net: remove CVS keywords

2008-06-11 21:00:38 -07:00

fib_hash.c

net: remove CVS keywords

2008-06-11 21:00:38 -07:00

fib_lookup.h

[IPV4] FIB_HASH: Reduce memory needs and speedup lookups

2008-01-28 15:02:46 -08:00

fib_rules.c

[NET] NETNS: Omit sock->sk_net without CONFIG_NET_NS.

2008-03-26 04:39:55 +09:00

fib_semantics.c

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

2008-06-13 20:52:39 -07:00

fib_trie.c

net: remove CVS keywords

2008-06-11 21:00:38 -07:00

icmp.c

net: remove CVS keywords

2008-06-11 21:00:38 -07:00

igmp.c

net: remove CVS keywords

2008-06-11 21:00:38 -07:00

inet_connection_sock.c

tcp: Revert 'process defer accept as established' changes.

2008-06-12 16:34:35 -07:00

inet_diag.c

net: remove CVS keywords

2008-06-11 21:00:38 -07:00

inet_fragment.c

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

2008-04-02 22:35:23 -07:00

inet_hashtables.c

[INET]: Uninline the __inet_inherit_port call.

2008-04-17 23:18:15 -07:00

inet_lro.c

…

inet_timewait_sock.c

[NETNS]: Add netns refcnt debug for timewait buckets.

2008-04-16 02:00:28 -07:00

inetpeer.c

net: remove CVS keywords

2008-06-11 21:00:38 -07:00

ip_forward.c

net: remove CVS keywords

2008-06-11 21:00:38 -07:00

ip_fragment.c

net: remove CVS keywords

2008-06-11 21:00:38 -07:00

ip_gre.c

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

2008-05-25 23:26:10 -07:00

ip_input.c

net: remove CVS keywords

2008-06-11 21:00:38 -07:00

ip_options.c

net: remove CVS keywords

2008-06-11 21:00:38 -07:00

ip_output.c

net: remove CVS keywords

2008-06-11 21:00:38 -07:00

ip_sockglue.c

net: remove CVS keywords

2008-06-11 21:00:38 -07:00

ipcomp.c

net: Remove unnecessary inclusions of asm/semaphore.h

2008-04-18 22:15:50 -04:00

ipconfig.c

net: remove CVS keywords

2008-06-11 21:00:38 -07:00

ipip.c

net: remove CVS keywords

2008-06-11 21:00:38 -07:00

ipmr.c

net: remove CVS keywords

2008-06-11 21:00:38 -07:00

Kconfig

Documentation: move nfsroot.txt to filesystems/

2008-04-11 13:18:01 -06:00

Makefile

[UDP]: Revert udplite and code split.

2008-03-06 16:22:02 -08:00

netfilter.c

[NETFILTER]: Add partial checksum validation helper

2008-04-14 11:15:49 +02:00

proc.c

net: remove CVS keywords

2008-06-11 21:00:38 -07:00

protocol.c

net: remove CVS keywords

2008-06-11 21:00:38 -07:00

raw.c

net: remove CVS keywords

2008-06-11 21:00:38 -07:00

route.c

net: remove CVS keywords

2008-06-11 21:00:38 -07:00

syncookies.c

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

2008-06-13 20:52:39 -07:00

sysctl_net_ipv4.c

net: remove CVS keywords

2008-06-11 21:00:38 -07:00

tcp_bic.c

[TCP]: BIC web page link is corrected.

2008-02-28 22:14:32 -08:00

tcp_cong.c

tcp: Limit cwnd growth when deferring for GSO

2008-04-29 03:13:52 -07:00

tcp_cubic.c

rename div64_64 to div64_u64

2008-05-01 08:03:58 -07:00

tcp_diag.c

net: remove CVS keywords

2008-06-11 21:00:38 -07:00

tcp_highspeed.c

…

tcp_htcp.c

…

tcp_hybla.c

net: fix returning void-valued expression warnings

2008-05-01 02:47:38 -07:00

tcp_illinois.c

…

tcp_input.c

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

2008-06-13 20:52:39 -07:00

tcp_ipv4.c

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

2008-06-13 20:52:39 -07:00

tcp_lp.c

…

tcp_minisocks.c

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

2008-06-13 20:52:39 -07:00

tcp_output.c

Merge branch 'net-next-2.6-misc-20080612a' of git://git.linux-ipv6.org/gitroot/yoshfuji/linux-2.6-next

2008-06-11 22:33:59 -07:00

tcp_probe.c

tcp: tcp_probe buffer overflow and incorrect return value

2008-04-24 21:11:58 -07:00

tcp_scalable.c

…

tcp_timer.c

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

2008-06-13 20:52:39 -07:00

tcp_vegas.c

net: fix returning void-valued expression warnings

2008-05-01 02:47:38 -07:00

tcp_vegas.h

…

tcp_veno.c

net: fix returning void-valued expression warnings

2008-05-01 02:47:38 -07:00

tcp_westwood.c

…

tcp_yeah.c

…

tcp.c

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

2008-06-13 20:52:39 -07:00

tunnel4.c

[IPV4] TUNNEL4: Fix incoming packet length check for inter-protocol tunnel.

2008-06-05 04:02:33 +09:00

udp_impl.h

[UDP]: Make full use of proto.h.udp_hash innovation.

2008-03-22 16:51:21 -07:00

udp.c

net: remove CVS keywords

2008-06-11 21:00:38 -07:00

udplite.c

net: remove CVS keywords

2008-06-11 21:00:38 -07:00

xfrm4_input.c

…

xfrm4_mode_beet.c

[IPSEC]: Fix BEET output

2008-03-26 16:51:09 -07:00

xfrm4_mode_transport.c

…

xfrm4_mode_tunnel.c

[IPSEC]: Fix inter address family IPsec tunnel handling.

2008-03-24 14:51:51 -07:00

xfrm4_output.c

[IPSEC]: Fix inter address family IPsec tunnel handling.

2008-03-24 14:51:51 -07:00

xfrm4_policy.c

[NET] NETNS: Omit net_device->nd_net without CONFIG_NET_NS.

2008-03-26 04:39:53 +09:00

xfrm4_state.c

[IPSEC]: Fix BEET output

2008-03-26 16:51:09 -07:00

xfrm4_tunnel.c

[IPCOMP]: Fix reception of incompressible packets

2008-01-31 19:27:24 -08:00