path: root/net
diff options
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 /net
parent05bf58ca4b8f0be7d7af830f943f6d6b2c9ccee1 (diff)
parentc800bcd5f53fd9455fc6c68f1a34306e5aa4f79a (diff)
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 'net')
2 files changed, 2 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index bc3c89792b0..4a91591b30a 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3446,7 +3446,7 @@ out:
* @rx_handler: receive handler to register
* @rx_handler_data: data pointer that is used by rx handler
- * Register a receive hander for a device. This handler will then be
+ * Register a receive handler for a device. This handler will then be
* called from __netif_receive_skb. A negative errno code is returned
* on a failure.
diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index 93886246a0b..549043c078c 100644
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -789,7 +789,7 @@ exit:
return error;
-#endif /* CONFIG_SYFS */
+#endif /* CONFIG_SYSFS */
net_rx_queue_update_kobjects(struct net_device *net, int old_num, int new_num)