AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity
8d2d3a3a32
kernel_optimize_test/drivers/net/e1000e
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
..
82571.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
defines.h e1000e: support new PBA format from EEPROM 2010-12-10 22:13:37 -08:00
e1000.h e1000e: power off PHY after reset when interface is down 2011-01-09 23:44:09 -08:00
es2lan.c e1000e: cleanup variables set but not used 2011-01-09 23:44:06 -08:00
ethtool.c e1000e: power off PHY after reset when interface is down 2011-01-09 23:44:09 -08:00
hw.h e1000e: add custom set_d[0|3]_lplu_state function pointer for 82574 2011-01-09 23:44:09 -08:00
ich8lan.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
lib.c e1000e: convert calls of ops.[read|write]_reg to e1e_[r|w]phy 2011-01-09 23:44:07 -08:00
Makefile
netdev.c e1000e: power off PHY after reset when interface is down 2011-01-09 23:44:09 -08:00
param.c e1000e: minor error message corrections 2010-12-10 22:13:46 -08:00
phy.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