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

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

dfb60ddd297dbc362003a26261a69eaf7cfa74b7