kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
linux-hardened/drivers/net/vxge
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 vxge: Update copyright information 2010-07-15 20:46:22 -07:00
vxge-config.c vxge: independent interrupt moderation 2010-12-10 16:08:24 -08:00
vxge-config.h vxge: code cleanup and reorganization 2010-12-10 16:08:21 -08:00
vxge-ethtool.c net: Fix too optimistic NETIF_F_HW_CSUM features 2010-12-06 12:59:04 -08:00
vxge-ethtool.h vxge: Update copyright information 2010-07-15 20:46:22 -07:00
vxge-main.c vxge: add missing flush of reset_task 2010-12-19 21:54:32 -08:00
vxge-main.h vxge: transmit timeout deadlock 2010-12-10 16:08:23 -08:00
vxge-reg.h vxge: correct multi-function detection 2010-11-11 09:30:23 -08:00
vxge-traffic.c vxge: remove duplicated part of check 2010-12-28 13:56:14 -08:00
vxge-traffic.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
vxge-version.h vxge: update driver version 2010-12-10 16:08:24 -08:00