From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Thu, 4 Mar 2010 16:31:13 +0000 (-0800)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/shemminger... 
X-Git-Tag: v2.6.34~15^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=33ff9324def1d618614ba869fa2d7e73fde8428e;p=thirdparty%2Fiproute2.git

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2
---

33ff9324def1d618614ba869fa2d7e73fde8428e
diff --cc ip/Makefile
index fd16fe947,46a98361b..2f223ca63
--- a/ip/Makefile
+++ b/ip/Makefile
@@@ -1,8 -1,9 +1,9 @@@
  IPOBJ=ip.o ipaddress.o ipaddrlabel.o iproute.o iprule.o \
      rtm_map.o iptunnel.o ip6tunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \
 -    ipmaddr.o ipmonitor.o ipmroute.o ipprefix.o \
 +    ipmaddr.o ipmonitor.o ipmroute.o ipprefix.o iptuntap.o \
      ipxfrm.o xfrm_state.o xfrm_policy.o xfrm_monitor.o \
-     iplink_vlan.o link_veth.o link_gre.o iplink_can.o
+     iplink_vlan.o link_veth.o link_gre.o iplink_can.o \
+     iplink_macvlan.o
  
  RTMONOBJ=rtmon.o
  
diff --cc ip/ip.c
index d846a763e,5ebd21581..e0cf17534
--- a/ip/ip.c
+++ b/ip/ip.c
@@@ -47,10 -42,11 +42,11 @@@ static void usage(void
  "Usage: ip [ OPTIONS ] OBJECT { COMMAND | help }\n"
  "       ip [ -force ] -batch filename\n"
  "where  OBJECT := { link | addr | addrlabel | route | rule | neigh | ntable |\n"
 -"                   tunnel | maddr | mroute | monitor | xfrm }\n"
 +"                   tunnel | tuntap | maddr | mroute | monitor | xfrm }\n"
  "       OPTIONS := { -V[ersion] | -s[tatistics] | -d[etails] | -r[esolve] |\n"
  "                    -f[amily] { inet | inet6 | ipx | dnet | link } |\n"
- "                    -o[neline] | -t[imestamp] | -b[atch] [filename] }\n");
+ "                    -o[neline] | -t[imestamp] | -b[atch] [filename] |\n"
+ "                    -rc[vbuf] [size]}\n");
  	exit(-1);
  }