q3k
/
linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
linux/drivers/net/ixgbe
History
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 ixgbe: add MAC and PHY support for x540 2010-11-16 19:27:16 -08:00
ixgbe.h ixgbe: update ntuple filter configuration 2011-01-09 23:44:12 -08:00
ixgbe_82598.c ixgbe: make silicon specific functions generic 2010-11-16 19:27:15 -08:00
ixgbe_82599.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
ixgbe_common.c ixgbe: Add anti-spoofing feature support 2010-12-24 21:41:06 -08:00
ixgbe_common.h ixgbe: Add anti-spoofing feature support 2010-12-24 21:41:06 -08:00
ixgbe_dcb.c ixgbe: add support for x540 MAC 2010-11-16 19:27:17 -08:00
ixgbe_dcb.h ixgbe: DCB: credit max only needs to be gt TSO size for 82598 2010-11-16 19:26:45 -08:00
ixgbe_dcb_82598.c ixgbe: DCB set PFC high and low water marks per data sheet specs 2010-11-16 19:26:44 -08:00
ixgbe_dcb_82598.h ixgbe: declare functions as static 2010-10-14 10:49:43 -07:00
ixgbe_dcb_82599.c ixgbe: DCB set PFC high and low water marks per data sheet specs 2010-11-16 19:26:44 -08:00
ixgbe_dcb_82599.h ixgbe: DCB, fix TX hang occurring in stress condition with PFC 2010-10-28 10:19:00 -07:00
ixgbe_dcb_nl.c ixgbe: add support for x540 MAC 2010-11-16 19:27:17 -08:00
ixgbe_ethtool.c ixgbe: update ntuple filter configuration 2011-01-09 23:44:12 -08:00
ixgbe_fcoe.c ixgbe: make sure FCoE DDP user buffers are really released by the HW 2010-11-16 19:27:14 -08:00
ixgbe_fcoe.h ixgbe: add a refcnt when turning on/off FCoE offload capability 2010-10-21 03:55:23 -07:00
ixgbe_main.c ixgbe: update ntuple filter configuration 2011-01-09 23:44:12 -08:00
ixgbe_mbx.c ixgbe: Add SR-IOV feature support to X540 2010-12-24 21:40:32 -08:00
ixgbe_mbx.h ixgbe: make silicon specific functions generic 2010-11-16 19:27:15 -08:00
ixgbe_phy.c ixgbe: fix X540 phy id to correct value 2010-12-10 22:12:46 -08:00
ixgbe_phy.h ixgbe: add MAC and PHY support for x540 2010-11-16 19:27:16 -08:00
ixgbe_sriov.c ixgbe: Add anti-spoofing feature support 2010-12-24 21:41:06 -08:00
ixgbe_sriov.h ixgbe: update copyright info 2010-10-21 03:55:21 -07:00
ixgbe_type.h ixgbe: update ntuple filter configuration 2011-01-09 23:44:12 -08:00
ixgbe_x540.c ixgbe: Add SR-IOV feature support to X540 2010-12-24 21:40:32 -08:00