tmp_suning_uos_patched/net/decnet
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 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_decnet.c net: Abstract default ADVMSS behind an accessor. 2010-12-13 12:52:14 -08:00
dn_dev.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
dn_fib.c decnet: RCU conversion and get rid of dev_base_lock 2010-11-08 13:50:08 -08:00
dn_neigh.c decnet: RCU conversion and get rid of dev_base_lock 2010-11-08 13:50:08 -08:00
dn_nsp_in.c Merge branch 'master' of /repos/git/net-next-2.6 2010-04-20 16:02:01 +02:00
dn_nsp_out.c net/decnet: Adjust confusing if indentation 2010-08-16 21:06:30 -07:00
dn_route.c net: Abstract default MTU metric calculation behind an accessor. 2010-12-14 13:01:14 -08:00
dn_rules.c net: use the macros defined for the members of flowi 2010-11-17 12:27:45 -08:00
dn_table.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
dn_timer.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
Kconfig [NET]: Rethink mark field in struct flowi 2006-12-02 21:21:39 -08:00
Makefile Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
README Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
sysctl_net_decnet.c net: avoid limits overflow 2010-11-10 12:12:00 -08:00
TODO Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00

                       Linux DECnet Project
                      ======================

The documentation for this kernel subsystem is available in the
Documentation/networking subdirectory of this distribution and also
on line at http://www.chygwyn.com/DECnet/

Steve Whitehouse <SteveW@ACM.org>