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

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

19beb1aa16cf17e00d71a862ae8ce9628215f479