From: Stephen Hemminger <stephen@networkplumber.org>
Date: Mon, 1 May 2017 16:26:51 +0000 (-0700)
Subject: Merge branch 'master' into net-next
X-Git-Tag: v4.12.0~47^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2b9100a087fe78133e48429da2bfd1abf91256c;p=thirdparty%2Fiproute2.git

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

d2b9100a087fe78133e48429da2bfd1abf91256c