summaryrefslogtreecommitdiffstats
path: root/Documentation/networking
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-04-02 16:23:38 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-04-02 16:23:38 -0700
commit159d8133d0b54a501a41a66fe3a0e7d16405e36d (patch)
treedd9b0204d90b25e1e0be933348776f09434333c6 /Documentation/networking
parent05bf58ca4b8f0be7d7af830f943f6d6b2c9ccee1 (diff)
parentc800bcd5f53fd9455fc6c68f1a34306e5aa4f79a (diff)
downloadlinux-159d8133d0b54a501a41a66fe3a0e7d16405e36d.tar.gz
linux-159d8133d0b54a501a41a66fe3a0e7d16405e36d.tar.bz2
linux-159d8133d0b54a501a41a66fe3a0e7d16405e36d.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina: "Usual rocket science -- mostly documentation and comment updates" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: sparse: fix comment doc: fix double words isdn: capi: fix "CAPI_VERSION" comment doc: DocBook: Fix typos in xml and template file Bluetooth: add module name for btwilink driver core: unexport static function create_syslog_header mmc: core: typo fix in printk specifier ARM: spear: clean up editing mistake net-sysfs: fix comment typo 'CONFIG_SYFS' doc: Insert MODULE_ in module-signing macros Documentation: update URL to hfsplus Technote 1150 gpio: update path to documentation ixgbe: Fix format string in ixgbe_fcoe. Kconfig: Remove useless "default N" lines user_namespace.c: Remove duplicated word in comment CREDITS: fix formatting treewide: Fix typo in Documentation/DocBook mm: Fix warning on make htmldocs caused by slab.c ata: ata-samsung_cf: cleanup in header file idr: remove unused prototype of idr_free()
Diffstat (limited to 'Documentation/networking')
-rw-r--r--Documentation/networking/spider_net.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/networking/spider_net.txt b/Documentation/networking/spider_net.txt
index 4b4adb8eb14f..b0b75f8463b3 100644
--- a/Documentation/networking/spider_net.txt
+++ b/Documentation/networking/spider_net.txt
@@ -73,7 +73,7 @@ Thus, in an idle system, the GDACTDPA, tail and head pointers will
all be pointing at the same descr, which should be "empty". All of the
other descrs in the ring should be "empty" as well.
-The show_rx_chain() routine will print out the the locations of the
+The show_rx_chain() routine will print out the locations of the
GDACTDPA, tail and head pointers. It will also summarize the contents
of the ring, starting at the tail pointer, and listing the status
of the descrs that follow.