From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Fri, 20 Jan 2012 16:17:59 +0000 (-0800)
Subject: Merge branch 'master' of nehalam:src/iproute2
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lisovros/iproute2_canprio.git/commitdiff_plain/fdeae171e52845b465971566c9a14498dda34307?hp=1b6f0bb5be5d71fd62ed6ccbc3665adc6e747b82

Merge branch 'master' of nehalam:src/iproute2
---

diff --git a/ip/ip.c b/ip/ip.c
index 7b4bacb..20dc3b5 100644
--- a/ip/ip.c
+++ b/ip/ip.c
@@ -72,8 +72,8 @@ static const struct cmd {
 	{ "neighbour",	do_ipneigh },
 	{ "ntable",	do_ipntable },
 	{ "ntbl",	do_ipntable },
-	{ "l2tp",	do_ipl2tp },
 	{ "link",	do_iplink },
+	{ "l2tp",	do_ipl2tp },
 	{ "tunnel",	do_iptunnel },
 	{ "tunl",	do_iptunnel },
 	{ "tuntap",	do_iptuntap },