]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
Merge branch 'master' into net-next
authorStephen Hemminger <shemming@brocade.com>
Fri, 13 May 2016 21:44:48 +0000 (14:44 -0700)
committerStephen Hemminger <shemming@brocade.com>
Fri, 13 May 2016 21:44:48 +0000 (14:44 -0700)

Trivial merge