]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
Merge branch 'master' into net-next
authorStephen Hemminger <shemming@brocade.com>
Thu, 16 Jun 2016 16:43:07 +0000 (09:43 -0700)
committerStephen Hemminger <shemming@brocade.com>
Thu, 16 Jun 2016 16:43:07 +0000 (09:43 -0700)

Trivial merge