kernel-ark/drivers/net/chelsio
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
..
common.h chelsio: Remove remnants of CONFIG_CHELSIO_T1_COUGAR 2010-06-03 03:18:20 -07:00
cphy.h
cpl5_cmd.h
cxgb2.c drivers/net/chelsio: Use pr_<level>, netif_msg_<type> 2010-02-26 01:38:34 -08:00
elmer0.h
espi.c drivers/net/chelsio: Use pr_<level>, netif_msg_<type> 2010-02-26 01:38:34 -08:00
espi.h
fpga_defs.h
gmac.h
Makefile
mv88e1xxx.c
mv88e1xxx.h
mv88x201x.c
my3126.c workqueue: convert cancel_rearming_delayed_work[queue]() users to cancel_delayed_work_sync() 2010-12-15 10:56:11 +01:00
pm3393.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2010-04-11 14:53:53 -07:00
regs.h
sge.c drivers/net/*/: Use static const 2010-12-21 02:16:10 -08:00
sge.h
subr.c tree-wide: fix comment/printk typos 2010-11-01 15:38:34 -04:00
suni1x10gexp_regs.h
tp.c
tp.h
vsc7326_reg.h
vsc7326.c drivers/net: return operator cleanup 2010-09-26 18:34:29 -07:00