]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
Merge branch 'master' into net-next
authorStephen Hemminger <shemming@brocade.com>
Tue, 21 Jun 2016 18:28:32 +0000 (11:28 -0700)
committerStephen Hemminger <shemming@brocade.com>
Tue, 21 Jun 2016 18:28:32 +0000 (11:28 -0700)

Trivial merge