original_kernel/net/ipv4
Linus Torvalds 9a9136e270 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (25 commits)
  sound: convert "sound" subdirectory to UTF-8
  MAINTAINERS: Add cxacru website/mailing list
  include files: convert "include" subdirectory to UTF-8
  general: convert "kernel" subdirectory to UTF-8
  documentation: convert the Documentation directory to UTF-8
  Convert the toplevel files CREDITS and MAINTAINERS to UTF-8.
  remove broken URLs from net drivers' output
  Magic number prefix consistency change to Documentation/magic-number.txt
  trivial: s/i_sem /i_mutex/
  fix file specification in comments
  drivers/base/platform.c: fix small typo in doc
  misc doc and kconfig typos
  Remove obsolete fat_cvf help text
  Fix occurrences of "the the "
  Fix minor typoes in kernel/module.c
  Kconfig: Remove reference to external mqueue library
  Kconfig: A couple of grammatical fixes in arch/i386/Kconfig
  Correct comments in genrtc.c to refer to correct /proc file.
  Fix more "deprecated" spellos.
  Fix "deprecated" typoes.
  ...

Fix trivial comment conflict in kernel/relay.c.
2007-05-09 12:54:17 -07:00
..
ipvs Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 2007-05-09 12:54:17 -07:00
netfilter [NETFILTER]: sip: Fix RTP address NAT 2007-05-03 03:35:31 -07:00
Kconfig Fix trivial typos in Kconfig* files 2007-05-09 07:12:20 +02:00
Makefile [IPV4]: Consolidate common SNMP code 2007-04-25 22:29:51 -07:00
af_inet.c header cleaning: don't include smp_lock.h when not used 2007-05-08 11:15:07 -07:00
ah4.c
arp.c
cipso_ipv4.c Fix occurrences of "the the " 2007-05-09 08:57:56 +02:00
datagram.c
devinet.c [NET]: Rework dev_base via list_head (v3) 2007-05-03 15:13:45 -07:00
esp4.c [XFRM]: beet: fix worst case header_len calculation 2007-04-25 22:28:39 -07:00
fib_frontend.c [IPV4] nl_fib_lookup: Initialise res.r before fib_res_put(&res) 2007-04-27 02:17:19 -07:00
fib_hash.c
fib_lookup.h
fib_rules.c
fib_semantics.c [NET]: cleanup extra semicolons 2007-04-25 22:29:24 -07:00
fib_trie.c
icmp.c
igmp.c [NET]: Rework dev_base via list_head (v3) 2007-05-03 15:13:45 -07:00
inet_connection_sock.c
inet_diag.c [NETLINK]: Switch cb_lock spinlock to mutex and allow to override it 2007-04-25 22:29:03 -07:00
inet_hashtables.c
inet_timewait_sock.c
inetpeer.c
ip_forward.c
ip_fragment.c
ip_gre.c [IPV4] IP_GRE: Unify code path to get hash array index. 2007-04-25 22:29:56 -07:00
ip_input.c [IPV4] SNMP: Support InMcastPkts and InBcastPkts 2007-04-30 00:58:29 -07:00
ip_options.c
ip_output.c [IPV4] SNMP: Support OutMcastPkts and OutBcastPkts 2007-04-30 00:58:32 -07:00
ip_sockglue.c [INET]: Add IP(V6)_PMTUDISC_RPOBE 2007-04-25 22:29:10 -07:00
ipcomp.c [SK_BUFF]: Introduce skb_copy_to_linear_data{_offset} 2007-04-25 22:28:29 -07:00
ipconfig.c [NET]: Rework dev_base via list_head (v3) 2007-05-03 15:13:45 -07:00
ipip.c [IPV4] IPIP: Unify code path to get hash array index. 2007-04-25 22:29:55 -07:00
ipmr.c [SK_BUFF]: Introduce skb_copy_to_linear_data{_offset} 2007-04-25 22:28:29 -07:00
multipath.c
multipath_drr.c [NET]: cleanup extra semicolons 2007-04-25 22:29:24 -07:00
multipath_random.c
multipath_rr.c
multipath_wrandom.c
netfilter.c
proc.c [IPV4]: Consolidate common SNMP code 2007-04-25 22:29:51 -07:00
protocol.c
raw.c
route.c
syncookies.c
sysctl_net_ipv4.c
tcp.c header cleaning: don't include smp_lock.h when not used 2007-05-08 11:15:07 -07:00
tcp_bic.c [TCP]: Congestion control API update. 2007-04-25 22:29:45 -07:00
tcp_cong.c [TCP]: Congestion control API update. 2007-04-25 22:29:45 -07:00
tcp_cubic.c [TCP]: Congestion control API update. 2007-04-25 22:29:45 -07:00
tcp_diag.c
tcp_highspeed.c [TCP] Highspeed: Limited slow-start is nowadays in tcp_slow_start 2007-05-03 13:28:35 -07:00
tcp_htcp.c [TCP]: Congestion control API update. 2007-04-25 22:29:45 -07:00
tcp_hybla.c
tcp_illinois.c [TCP]: Fix linkage errors on i386. 2007-04-25 22:29:49 -07:00
tcp_input.c [TCP] FRTO: RFC4138 allows Nagle override when new data must be sent 2007-04-30 00:58:16 -07:00
tcp_ipv4.c [NET]: Treat CHECKSUM_PARTIAL as CHECKSUM_UNNECESSARY 2007-04-25 22:28:43 -07:00
tcp_lp.c [TCP]: Fix linkage errors on i386. 2007-04-25 22:29:49 -07:00
tcp_minisocks.c
tcp_output.c header cleaning: don't include smp_lock.h when not used 2007-05-08 11:15:07 -07:00
tcp_probe.c
tcp_scalable.c
tcp_timer.c
tcp_vegas.c [TCP]: Fix linkage errors on i386. 2007-04-25 22:29:49 -07:00
tcp_vegas.h [TCP] TCP YEAH: Use vegas dont copy it. 2007-04-25 22:29:46 -07:00
tcp_veno.c [TCP]: Fix linkage errors on i386. 2007-04-25 22:29:49 -07:00
tcp_westwood.c [TCP]: Congestion control API update. 2007-04-25 22:29:45 -07:00
tcp_yeah.c [TCP] TCP YEAH: Use vegas dont copy it. 2007-04-25 22:29:46 -07:00
tunnel4.c
udp.c Fix occurrences of "the the " 2007-05-09 08:57:56 +02:00
udp_impl.h
udplite.c
xfrm4_input.c
xfrm4_mode_beet.c [XFRM]: beet: fix worst case header_len calculation 2007-04-25 22:28:39 -07:00
xfrm4_mode_transport.c
xfrm4_mode_tunnel.c
xfrm4_output.c
xfrm4_policy.c [NET]: cleanup extra semicolons 2007-04-25 22:29:24 -07:00
xfrm4_state.c
xfrm4_tunnel.c