From: Stephen Hemminger <stephen@networkplumber.org>
Date: Tue, 19 Apr 2016 15:01:55 +0000 (-0700)
Subject: Merge branch 'master' into net-next
X-Git-Tag: v4.7.0~130
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=606580592232f0f3e5afc9dbad6b5930172e99a6;p=thirdparty%2Fiproute2.git

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

606580592232f0f3e5afc9dbad6b5930172e99a6