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

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

590dde3a9823b2c05ef6754e16cfd7877981f6b2