linux/drivers/net/cxgb3
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
..
adapter.h cxgb3: function namespace cleanup 2010-10-21 07:19:02 -07:00
ael1002.c drivers/net/*/: Use static const 2010-12-21 02:16:10 -08:00
aq100x.c cxgb3: AQ100X phy support update 2009-07-08 10:54:18 -07:00
common.h cxgb3: function namespace cleanup 2010-10-21 07:19:02 -07:00
cxgb3_ctl_defs.h cxgb3: add control to access embedded images 2008-12-26 01:16:39 -08:00
cxgb3_defs.h cxgb3: function namespace cleanup 2010-10-21 07:19:02 -07:00
cxgb3_ioctl.h
cxgb3_main.c drivers/net: don't use flush_scheduled_work() 2010-12-12 16:45:14 +01:00
cxgb3_offload.c drivers/net: use vzalloc() 2010-11-27 22:53:38 -08:00
cxgb3_offload.h RDMA/cxgb3: Doorbell overflow avoidance and recovery 2010-02-24 10:40:28 -08:00
firmware_exports.h
l2t.c drivers/net: Remove unnecessary returns from void function()s 2010-05-14 00:19:28 -07:00
l2t.h
Makefile cxgb3: add support for the Aquantia 10G-BT phy 2009-05-29 15:55:05 -07:00
mc5.c tree-wide: fix comment/printk typos 2010-11-01 15:38:34 -04:00
regs.h cxgb3: Add register bit definition for Fatal Parity Error. 2010-09-03 10:03:50 -07:00
sge_defs.h
sge.c cxgb3: Fix panic in free_tx_desc() 2010-10-28 10:27:02 -07:00
t3_cpl.h
t3_hw.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
t3cdev.h
version.h cxgb3: request 7.10 firmware 2010-06-25 21:33:13 -07:00
vsc8211.c cxgb3: Use generic MDIO definitions and mdio_mii_ioctl() 2009-04-29 17:32:32 -07:00
xgmac.c net: convert multicast list to list_head 2010-04-03 14:22:15 -07:00