diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 19:35:11 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 19:35:11 -0400 |
commit | 708e16892e1646594a29eaa7ac7b209b600b9fd2 (patch) | |
tree | fe7c31bc0edef84eb1075c7e195340047d6aaa17 /Documentation/networking/vortex.txt | |
parent | f3c87a8999c28f2948ebd407574f7e9fb5c577b2 (diff) | |
parent | a847825970e741e20a09c659978baa34016b63bc (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (39 commits)
Add missing maintainer countries in CREDITS
Fix bytes <-> kilobytes typo in Kconfig for ramdisk
fix a typo in Documentation/pi-futex.txt
BUG_ON conversion for fs/xfs/
BUG_ON() conversion in fs/nfsd/
BUG_ON conversion for fs/reiserfs
BUG_ON cleanups in arch/i386
BUG_ON cleanup in drivers/net/tokenring/
BUG_ON cleanup for drivers/md/
kerneldoc-typo in led-class.c
debugfs: spelling fix
rcutorture: Fix incorrect description of default for nreaders parameter
parport: Remove space in function calls
Michal Wronski: update contact info
Spelling fix: "control" instead of "cotrol"
reboot parameter in Documentation/kernel-parameters.txt
Fix copy&waste bug in comment in scripts/kernel-doc
remove duplicate "until" from kernel/workqueue.c
ite_gpio fix tabbage
fix file specification in comments
...
Fixed trivial path conflicts due to removed files:
arch/mips/dec/boot/decstation.c, drivers/char/ite_gpio.c
Diffstat (limited to 'Documentation/networking/vortex.txt')
-rw-r--r-- | Documentation/networking/vortex.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/networking/vortex.txt b/Documentation/networking/vortex.txt index 6091e5f6794f..6356d3faed36 100644 --- a/Documentation/networking/vortex.txt +++ b/Documentation/networking/vortex.txt | |||
@@ -359,13 +359,13 @@ steps you should take: | |||
359 | 359 | ||
360 | Eliminate some variables: try different cards, different | 360 | Eliminate some variables: try different cards, different |
361 | computers, different cables, different ports on the switch/hub, | 361 | computers, different cables, different ports on the switch/hub, |
362 | different versions of the kernel or ofthe driver, etc. | 362 | different versions of the kernel or of the driver, etc. |
363 | 363 | ||
364 | - OK, it's a driver problem. | 364 | - OK, it's a driver problem. |
365 | 365 | ||
366 | You need to generate a report. Typically this is an email to the | 366 | You need to generate a report. Typically this is an email to the |
367 | maintainer and/or linux-net@vger.kernel.org. The maintainer's | 367 | maintainer and/or linux-net@vger.kernel.org. The maintainer's |
368 | email address will be inthe driver source or in the MAINTAINERS file. | 368 | email address will be in the driver source or in the MAINTAINERS file. |
369 | 369 | ||
370 | - The contents of your report will vary a lot depending upon the | 370 | - The contents of your report will vary a lot depending upon the |
371 | problem. If it's a kernel crash then you should refer to the | 371 | problem. If it's a kernel crash then you should refer to the |