]> git.proxmox.com Git - mirror_iproute2.git/commitdiff
projects / mirror_iproute2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 811aca0 943c30d)
Merge branch 'master' into net-next
authorStephen Hemminger <shemming@brocade.com>
Fri, 10 Apr 2015 20:27:37 +0000 (13:27 -0700)
committerStephen Hemminger <shemming@brocade.com>
Fri, 10 Apr 2015 20:27:37 +0000 (13:27 -0700)
1  2 
configure patch | diff1 | diff2 | blob | history

diff --cc configure
Simple merge
Upstream mirror of iproute2