summaryrefslogtreecommitdiffstats
path: root/net/mpls
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2015-03-09 12:54:48 +0100
committerDavid S. Miller <davem@davemloft.net>2015-03-09 15:51:59 -0400
commit26c459a8072f2bb0680081205376e1371c114b12 (patch)
tree72a7441e65c63a6f7ded06131a0625f3d602cf18 /net/mpls
parent143fe22f50a8be855bba77b5b2dc9dd1a5982b1c (diff)
downloadlinux-26c459a8072f2bb0680081205376e1371c114b12.tar.bz2
mpls: Spelling: s/conceved/conceived/, s/as/a/
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Acked-by: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mpls')
-rw-r--r--net/mpls/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mpls/Kconfig b/net/mpls/Kconfig
index f4286ee7e2b0..dfca485863e9 100644
--- a/net/mpls/Kconfig
+++ b/net/mpls/Kconfig
@@ -7,9 +7,9 @@ menuconfig MPLS
default n
---help---
MultiProtocol Label Switching routes packets through logical
- circuits. Originally conceved as a way of routing packets at
+ circuits. Originally conceived as a way of routing packets at
hardware speeds (before hardware was capable of routing ipv4 packets),
- MPLS remains as simple way of making tunnels.
+ MPLS remains a simple way of making tunnels.
If you have not heard of MPLS you probably want to say N here.