From: Stephen Hemminger <stephen@networkplumber.org>
Date: Tue, 14 Mar 2017 23:42:59 +0000 (-0700)
Subject: Merge branch 'master' into net-next
X-Git-Tag: v4.12.0~47^2~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4303c0dd99d99679260e696eb864c865fd12bd1d;p=thirdparty%2Fiproute2.git

Merge branch 'master' into net-next
---

4303c0dd99d99679260e696eb864c865fd12bd1d