]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
Merge branch 'master' into net-next
authorStephen Hemminger <shemming@brocade.com>
Fri, 23 Oct 2015 06:42:37 +0000 (23:42 -0700)
committerStephen Hemminger <shemming@brocade.com>
Fri, 23 Oct 2015 06:42:37 +0000 (23:42 -0700)
1  2 
include/linux/rtnetlink.h
ip/iproute.c

Simple merge
diff --cc ip/iproute.c
Simple merge