From: Stephen Hemminger <stephen@networkplumber.org>
Date: Tue, 4 Apr 2017 21:56:41 +0000 (-0700)
Subject: Merge branch 'master' into net-next
X-Git-Tag: v4.12.0~47^2~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4878dfae4d676fc612b6fc546e252f274ecb35e;p=thirdparty%2Fiproute2.git

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

f4878dfae4d676fc612b6fc546e252f274ecb35e