Linus Torvalds 008d23e485 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial ...

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)
  Documentation/trace/events.txt: Remove obsolete sched_signal_send.
  writeback: fix global_dirty_limits comment runtime -> real-time
  ppc: fix comment typo singal -> signal
  drivers: fix comment typo diable -> disable.
  m68k: fix comment typo diable -> disable.
  wireless: comment typo fix diable -> disable.
  media: comment typo fix diable -> disable.
  remove doc for obsolete dynamic-printk kernel-parameter
  remove extraneous 'is' from Documentation/iostats.txt
  Fix spelling milisec -> ms in snd_ps3 module parameter description
  Fix spelling mistakes in comments
  Revert conflicting V4L changes
  i7core_edac: fix typos in comments
  mm/rmap.c: fix comment
  sound, ca0106: Fix assignment to 'channel'.
  hrtimer: fix a typo in comment
  init/Kconfig: fix typo
  anon_inodes: fix wrong function name in comment
  fix comment typos concerning "consistent"
  poll: fix a typo in comment
  ...

Fix up trivial conflicts in:
 - drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c)
 - fs/ext4/ext4.h

Also fix missed 'diabled' typo in drivers/net/bnx2x/bnx2x.h while at it.

2011-01-13 10:05:56 -08:00

..

netfilter

netfilter: x_tables: dont block BH while reading counters

2011-01-10 20:11:38 +01:00

af_inet.c

net: use the macros defined for the members of flowi

2010-11-17 12:27:45 -08:00

ah4.c

ah: reload pointers to skb data after calling skb_cow_data()

2011-01-11 14:03:10 -08:00

arp.c

arp: allow to invalidate specific ARP entries

2011-01-10 16:10:37 -08:00

cipso_ipv4.c

Update broken web addresses in the kernel.

2010-10-18 11:03:14 +02:00

datagram.c

net: return operator cleanup

2010-09-23 14:33:39 -07:00

devinet.c

ipv4: Don't pre-seed hoplimit metric.

2010-12-12 22:08:17 -08:00

esp4.c

xfrm: Traffic Flow Confidentiality for IPv4 ESP

2010-12-10 14:43:59 -08:00

fib_frontend.c

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

2010-12-26 22:37:05 -08:00

fib_hash.c

fib: Fix fib zone and its hash leak on namespace stop

2010-10-28 10:27:03 -07:00

fib_lookup.h

fib: fib_result_assign() should not change fib refcounts

2010-11-04 12:05:32 -07:00

fib_rules.c

fib: RCU conversion of fib_lookup()

2010-10-05 20:39:38 -07:00

fib_semantics.c

net: use the macros defined for the members of flowi

2010-11-17 12:27:45 -08:00

fib_trie.c

net: allow GFP_HIGHMEM in __vmalloc()

2010-11-21 10:04:04 -08:00

gre.c

tunnels: add _rcu annotations

2010-10-25 13:09:45 -07:00

icmp.c

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

2010-11-19 13:13:47 -08:00

igmp.c

igmp: refine skb allocations

2010-11-18 11:02:23 -08:00

inet_connection_sock.c

tcp: disallow bind() to reuse addr/port

2011-01-11 14:03:07 -08:00

inet_diag.c

netlink: test for all flags of the NLM_F_DUMP composite

2011-01-09 16:25:03 -08:00

inet_fragment.c

…

inet_hashtables.c

inet: Fix __inet_inherit_port() to correctly increment bsockets and num_owners

2010-11-28 18:18:44 -08:00

inet_lro.c

…

inet_timewait_sock.c

…

inetpeer.c

inetpeer: Kill use of inet_peer_address_t typedef.

2010-12-01 17:28:18 -08:00

ip_forward.c

…

ip_fragment.c

ipv4: IP defragmentation must be ECN aware

2011-01-06 11:21:30 -08:00

ip_gre.c

ipv4: Don't pre-seed hoplimit metric.

2010-12-12 22:08:17 -08:00

ip_input.c

…

ip_options.c

…

ip_output.c

ipv4: Don't pre-seed hoplimit metric.

2010-12-12 22:08:17 -08:00

ip_sockglue.c

ipv4: add __rcu annotations to ip_ra_chain

2010-10-25 14:18:28 -07:00

ipcomp.c

…

ipconfig.c

net: add some KERN_CONT markers to continuation lines

2010-11-28 10:47:17 -08:00

ipip.c

ipip: add module alias for tunl0 tunnel device

2010-12-01 12:53:23 -08:00

ipmr.c

net: use the macros defined for the members of flowi

2010-11-17 12:27:45 -08:00

Kconfig

Docs/Kconfig: Update: osdl.org -> linuxfoundation.org

2010-11-15 23:50:13 +01:00

Makefile

…

netfilter.c

net: use the macros defined for the members of flowi

2010-11-17 12:27:45 -08:00

proc.c

tcp: Replace time wait bucket msg by counter

2010-12-08 12:16:33 -08:00

protocol.c

net: add __rcu annotations to protocol

2010-10-27 11:37:31 -07:00

raw.c

net: use the macros defined for the members of flowi

2010-11-17 12:27:45 -08:00

route.c

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

2011-01-04 11:57:25 -08:00

syncookies.c

net: use the macros defined for the members of flowi

2010-11-17 12:27:45 -08:00

sysctl_net_ipv4.c

net: add limits to ip_default_ttl

2010-12-13 12:16:14 -08:00

tcp_bic.c

…

tcp_cong.c

…

tcp_cubic.c

…

tcp_diag.c

…

tcp_highspeed.c

…

tcp_htcp.c

…

tcp_hybla.c

…

tcp_illinois.c

Update broken web addresses in the kernel.

2010-10-18 11:03:14 +02:00

tcp_input.c

tcp: cleanup of cwnd initialization in tcp_init_metrics()

2010-12-23 09:54:26 -08:00

tcp_ipv4.c

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

2010-12-26 22:37:05 -08:00

tcp_lp.c

…

tcp_minisocks.c

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

2010-12-08 13:47:38 -08:00

tcp_output.c

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2011-01-13 10:05:56 -08:00

tcp_probe.c

net: ipv4: tcp_probe: cleanup snprintf() use

2010-11-17 12:27:46 -08:00

tcp_scalable.c

…

tcp_timer.c

tcp: use correct counters in CA_CWR state too

2010-10-17 13:46:33 -07:00

tcp_vegas.c

…

tcp_vegas.h

…

tcp_veno.c

Update broken web addresses in the kernel.

2010-10-18 11:03:14 +02:00

tcp_westwood.c

net: return operator cleanup

2010-09-23 14:33:39 -07:00

tcp_yeah.c

…

tcp.c

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

2010-12-08 13:47:38 -08:00

tunnel4.c

tunnels: add __rcu annotations

2010-10-27 11:37:32 -07:00

udp_impl.h

…

udp.c

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

2010-12-17 12:27:22 -08:00

udplite.c

net: fix nulls list corruptions in sk_prot_alloc

2010-12-16 14:26:56 -08:00

xfrm4_input.c

…

xfrm4_mode_beet.c

…

xfrm4_mode_transport.c

…

xfrm4_mode_tunnel.c

ipv4: Don't pre-seed hoplimit metric.

2010-12-12 22:08:17 -08:00

xfrm4_output.c

…

xfrm4_policy.c

net: use the macros defined for the members of flowi

2010-11-17 12:27:45 -08:00

xfrm4_state.c

…

xfrm4_tunnel.c

…