From: Stephen Hemminger <shemminger@vyatta.com>
Date: Wed, 3 Oct 2012 15:52:59 +0000 (-0700)
Subject: Merge branch 'vxlan'
X-Git-Tag: v3.7.0~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=253eb98b77e4b88a437009a25417349c3a128986;p=thirdparty%2Fiproute2.git

Merge branch 'vxlan'

Conflicts:
	include/linux/if_link.h
---

253eb98b77e4b88a437009a25417349c3a128986