diff options
author | Thomas Haller <thaller@redhat.com> | 2019-09-01 12:39:55 (GMT) |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2019-09-01 12:40:08 (GMT) |
commit | 2154891180bbae40af2f1abab5f6c4f7040de81a (patch) | |
tree | 58a6d3a96a27c43cf0df827d8256843159436119 /man | |
parent | f3d5c44d21243d5eb59bfc2878d4977df2fd1369 (diff) | |
parent | 9af32928c1d03ba3a134dc457adf917ec65d35b8 (diff) | |
download | libnl-2154891180bbae40af2f1abab5f6c4f7040de81a.zip libnl-2154891180bbae40af2f1abab5f6c4f7040de81a.tar.gz libnl-2154891180bbae40af2f1abab5f6c4f7040de81a.tar.bz2 |
route/xfrmi: merge branch 'ebirger/add-xfrmi-support'
Rebased original pull request #214 on master. One commit ("xfrmi: add
IFLA_XFRM_* definitions to if_link.h") was thereby dropped as it
is no longer necessary. Otherwise, the two remaining patches applied
cleanly. Then, add two more patches to the branch before merging.
https://github.com/thom311/libnl/pull/214
Diffstat (limited to 'man')
0 files changed, 0 insertions, 0 deletions