OpenCloudOS-Kernel/drivers/net/bnx2x
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
..
Makefile bnx2x: add DCB support 2010-12-16 13:15:55 -08:00
bnx2x.h Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-01-13 10:05:56 -08:00
bnx2x_cmn.c bnx2x: add DCB support 2010-12-16 13:15:55 -08:00
bnx2x_cmn.h bnx2x: add DCB support 2010-12-16 13:15:55 -08:00
bnx2x_dcb.c bnx2x: adding dcbnl support 2010-12-31 10:50:55 -08:00
bnx2x_dcb.h bnx2x: adding dcbnl support 2010-12-31 10:50:55 -08:00
bnx2x_dump.h bnx2x: registers dump fixes 2011-01-09 15:47:38 -08:00
bnx2x_ethtool.c bnx2x: registers dump fixes 2011-01-09 15:47:38 -08:00
bnx2x_fw_defs.h bnx2x, cnic, bnx2i: use new FW/HSI 2010-10-06 14:10:35 -07:00
bnx2x_fw_file_hdr.h bnx2x, cnic, bnx2i: use new FW/HSI 2010-10-06 14:10:35 -07:00
bnx2x_hsi.h bnx2x: replace FW to 6.2.5 2010-12-16 13:15:57 -08:00
bnx2x_init.h bnx2x: registers dump fixes 2011-01-09 15:47:38 -08:00
bnx2x_init_ops.h bnx2x: Fixed a compilation warning 2010-12-12 15:02:58 -08:00
bnx2x_link.c bnx2x: remove bogus check 2010-12-21 10:51:45 -08:00
bnx2x_link.h bnx2x: Add DCB/PFC support - link layer 2010-12-16 13:15:55 -08:00
bnx2x_main.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
bnx2x_reg.h Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-01-13 10:05:56 -08:00
bnx2x_stats.c bnx2x: Fix the race on bp->stats_pending. 2011-01-09 15:47:47 -08:00
bnx2x_stats.h bnx2x: add FCoE ring 2010-12-16 13:15:54 -08:00