linux/include/net/sctp
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
..
auth.h [SCTP]: Stop claiming that this is a "reference implementation" 2008-02-05 10:59:07 -05:00
checksum.h sctp: Clean up sctp checksumming code 2009-02-16 00:03:10 -08:00
command.h sctp: kill unused macros in head file 2010-11-29 09:41:12 -08:00
constants.h sctp: kill unused macro definition 2010-11-28 10:47:15 -08:00
sctp.h net: return operator cleanup 2010-09-23 14:33:39 -07:00
sm.h net: return operator cleanup 2010-09-23 14:33:39 -07:00
structs.h sctp: kill unused macros in head file 2010-11-29 09:41:12 -08:00
tsnmap.h net: return operator cleanup 2010-09-23 14:33:39 -07:00
ulpevent.h [SCTP]: Fix compiler warning about const qualifiers 2008-04-12 18:40:06 -07:00
ulpqueue.h [SCTP]: Stop claiming that this is a "reference implementation" 2008-02-05 10:59:07 -05:00
user.h tree-wide: fix comment/printk typos 2010-11-01 15:38:34 -04:00