aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-11-15 19:47:22 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2013-11-15 19:47:22 -0500
commit9073e1a804c3096eda84ee7cbf11d1f174236c75 (patch)
tree2f1b488b606bc03f8c5ce133f9158196fef07cd2 /net
parent4937e2a6f939a41bf811378e80d71f68aa0950c6 (diff)
parent2bb9936beac2eed0c1ed907f83694bc752e159d9 (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 earth-shaking, news-breaking, rocket science pile from trivial.git" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (23 commits) doc: usb: Fix typo in Documentation/usb/gadget_configs.txt doc: add missing files to timers/00-INDEX timekeeping: Fix some trivial typos in comments mm: Fix some trivial typos in comments irq: Fix some trivial typos in comments NUMA: fix typos in Kconfig help text mm: update 00-INDEX doc: Documentation/DMA-attributes.txt fix typo DRM: comment: `halve' -> `half' Docs: Kconfig: `devlopers' -> `developers' doc: typo on word accounting in kprobes.c in mutliple architectures treewide: fix "usefull" typo treewide: fix "distingush" typo mm/Kconfig: Grammar s/an/a/ kexec: Typo s/the/then/ Documentation/kvm: Update cpuid documentation for steal time and pv eoi treewide: Fix common typo in "identify" __page_to_pfn: Fix typo in comment Correct some typos for word frequency clk: fixed-factor: Fix a trivial typo ...
Diffstat (limited to 'net')
-rw-r--r--net/can/af_can.c2
-rw-r--r--net/netfilter/xt_set.c4
-rw-r--r--net/vmw_vsock/Kconfig2
3 files changed, 4 insertions, 4 deletions
diff --git a/net/can/af_can.c b/net/can/af_can.c
index 3ab8dd2e1282..d249874a366d 100644
--- a/net/can/af_can.c
+++ b/net/can/af_can.c
@@ -420,7 +420,7 @@ static struct hlist_head *find_rcv_list(canid_t *can_id, canid_t *mask,
420 * @mask: CAN mask (see description) 420 * @mask: CAN mask (see description)
421 * @func: callback function on filter match 421 * @func: callback function on filter match
422 * @data: returned parameter for callback function 422 * @data: returned parameter for callback function
423 * @ident: string for calling module indentification 423 * @ident: string for calling module identification
424 * 424 *
425 * Description: 425 * Description:
426 * Invokes the callback function with the received sk_buff and the given 426 * Invokes the callback function with the received sk_buff and the given
diff --git a/net/netfilter/xt_set.c b/net/netfilter/xt_set.c
index e7c4e0e01ff5..80c2e2d603e0 100644
--- a/net/netfilter/xt_set.c
+++ b/net/netfilter/xt_set.c
@@ -84,7 +84,7 @@ set_match_v0_checkentry(const struct xt_mtchk_param *par)
84 index = ip_set_nfnl_get_byindex(par->net, info->match_set.index); 84 index = ip_set_nfnl_get_byindex(par->net, info->match_set.index);
85 85
86 if (index == IPSET_INVALID_ID) { 86 if (index == IPSET_INVALID_ID) {
87 pr_warning("Cannot find set indentified by id %u to match\n", 87 pr_warning("Cannot find set identified by id %u to match\n",
88 info->match_set.index); 88 info->match_set.index);
89 return -ENOENT; 89 return -ENOENT;
90 } 90 }
@@ -134,7 +134,7 @@ set_match_v1_checkentry(const struct xt_mtchk_param *par)
134 index = ip_set_nfnl_get_byindex(par->net, info->match_set.index); 134 index = ip_set_nfnl_get_byindex(par->net, info->match_set.index);
135 135
136 if (index == IPSET_INVALID_ID) { 136 if (index == IPSET_INVALID_ID) {
137 pr_warning("Cannot find set indentified by id %u to match\n", 137 pr_warning("Cannot find set identified by id %u to match\n",
138 info->match_set.index); 138 info->match_set.index);
139 return -ENOENT; 139 return -ENOENT;
140 } 140 }
diff --git a/net/vmw_vsock/Kconfig b/net/vmw_vsock/Kconfig
index b5fa7e40cdcb..14810abedc2e 100644
--- a/net/vmw_vsock/Kconfig
+++ b/net/vmw_vsock/Kconfig
@@ -6,7 +6,7 @@ config VSOCKETS
6 tristate "Virtual Socket protocol" 6 tristate "Virtual Socket protocol"
7 help 7 help
8 Virtual Socket Protocol is a socket protocol similar to TCP/IP 8 Virtual Socket Protocol is a socket protocol similar to TCP/IP
9 allowing comunication between Virtual Machines and hypervisor 9 allowing communication between Virtual Machines and hypervisor
10 or host. 10 or host.
11 11
12 You should also select one or more hypervisor-specific transports 12 You should also select one or more hypervisor-specific transports