]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
Merge branch 'master' into net-next
authorStephen Hemminger <shemming@brocade.com>
Tue, 7 Apr 2015 15:56:14 +0000 (08:56 -0700)
committerStephen Hemminger <shemming@brocade.com>
Tue, 7 Apr 2015 15:56:14 +0000 (08:56 -0700)
Conflicts:
man/man8/ip-route.8.in

1  2 
man/man8/ip-route.8.in
man/man8/ip.8

Simple merge
diff --cc man/man8/ip.8
Simple merge