From: Stephen Hemminger <stephen@networkplumber.org>
Date: Mon, 12 Dec 2016 23:24:40 +0000 (-0800)
Subject: Merge branch 'master' into net-next
X-Git-Tag: v4.10.0~78
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a56c090e44d46997bfd43fd4554bdcf60a13290;p=thirdparty%2Fiproute2.git

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

2a56c090e44d46997bfd43fd4554bdcf60a13290