diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-07 21:16:26 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-07 21:16:26 -0400 |
commit | 28596c9722289b2f98fa83a2e4351eb0a031b953 (patch) | |
tree | f1a76a8a2604ac710bad28e3ad1b5976601c82d4 /net | |
parent | b6420ebd4a541455a75f9802f58cfa3ba0ea5390 (diff) | |
parent | 7bb38d57fd75f03753a5b362916c5bbde8290208 (diff) | |
download | op-kernel-dev-28596c9722289b2f98fa83a2e4351eb0a031b953.zip op-kernel-dev-28596c9722289b2f98fa83a2e4351eb0a031b953.tar.gz |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull "trivial tree" updates from Jiri Kosina:
"Usual pile from trivial tree everyone is so eagerly waiting for"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
Remove MN10300_PROC_MN2WS0038
mei: fix comments
treewide: Fix typos in Kconfig
kprobes: update jprobe_example.c for do_fork() change
Documentation: change "&" to "and" in Documentation/applying-patches.txt
Documentation: remove obsolete pcmcia-cs from Changes
Documentation: update links in Changes
Documentation: Docbook: Fix generated DocBook/kernel-api.xml
score: Remove GENERIC_HAS_IOMAP
gpio: fix 'CONFIG_GPIO_IRQCHIP' comments
tty: doc: Fix grammar in serial/tty
dma-debug: modify check_for_stack output
treewide: fix errors in printk
genirq: fix reference in devm_request_threaded_irq comment
treewide: fix synchronize_rcu() in comments
checkstack.pl: port to AArch64
doc: queue-sysfs: minor fixes
init/do_mounts: better syntax description
MIPS: fix comment spelling
powerpc/simpleboot: fix comment
...
Diffstat (limited to 'net')
-rw-r--r-- | net/mac802154/wpan.c | 2 | ||||
-rw-r--r-- | net/netfilter/ipset/ip_set_core.c | 2 | ||||
-rw-r--r-- | net/rds/af_rds.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/net/mac802154/wpan.c b/net/mac802154/wpan.c index 5478388..d593500 100644 --- a/net/mac802154/wpan.c +++ b/net/mac802154/wpan.c @@ -90,7 +90,7 @@ mac802154_wpan_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) } case SIOCSIFADDR: dev_warn(&dev->dev, - "Using DEBUGing ioctl SIOCSIFADDR isn't recommened!\n"); + "Using DEBUGing ioctl SIOCSIFADDR isn't recommended!\n"); if (sa->family != AF_IEEE802154 || sa->addr.addr_type != IEEE802154_ADDR_SHORT || sa->addr.pan_id == IEEE802154_PANID_BROADCAST || diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c index ec8114f..5edbbe8 100644 --- a/net/netfilter/ipset/ip_set_core.c +++ b/net/netfilter/ipset/ip_set_core.c @@ -478,7 +478,7 @@ ip_set_test(ip_set_id_t index, const struct sk_buff *skb, if (ret == -EAGAIN) { /* Type requests element to be completed */ - pr_debug("element must be competed, ADD is triggered\n"); + pr_debug("element must be completed, ADD is triggered\n"); write_lock_bh(&set->lock); set->variant->kadt(set, skb, par, IPSET_ADD, opt); write_unlock_bh(&set->lock); diff --git a/net/rds/af_rds.c b/net/rds/af_rds.c index 424ff62..1044337 100644 --- a/net/rds/af_rds.c +++ b/net/rds/af_rds.c @@ -83,7 +83,7 @@ static int rds_release(struct socket *sock) /* * the binding lookup hash uses rcu, we need to - * make sure we sychronize_rcu before we free our + * make sure we synchronize_rcu before we free our * entry */ rds_remove_bound(rs); |