From: Stephen Hemminger <shemming@brocade.com>
Date: Thu, 30 Oct 2014 16:38:56 +0000 (-0700)
Subject: Merge branch 'net-next'
X-Git-Tag: v3.18.0~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0bf4c355eed1db158a3afc0f9924473d18d8fb7d;p=thirdparty%2Fiproute2.git

Merge branch 'net-next'

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

0bf4c355eed1db158a3afc0f9924473d18d8fb7d