From: Stephen Hemminger <stephen@networkplumber.org>
Date: Fri, 20 Jan 2017 17:27:57 +0000 (-0800)
Subject: Merge branch 'master' into net-next
X-Git-Tag: v4.11.0~93
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9174b4cf3eee2e2b6967ecb1f97c0be229cb8d11;p=thirdparty%2Fiproute2.git

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

9174b4cf3eee2e2b6967ecb1f97c0be229cb8d11