]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
Merge branch 'master' into net-next
authorStephen Hemminger <shemming@brocade.com>
Wed, 4 Nov 2015 00:38:15 +0000 (16:38 -0800)
committerStephen Hemminger <shemming@brocade.com>
Wed, 4 Nov 2015 00:38:15 +0000 (16:38 -0800)

Trivial merge