]> granicus.if.org Git - libnl/commitdiff
Merge branch 'xfrm'
authorThomas Haller <thaller@redhat.com>
Sun, 20 Jul 2014 16:23:34 +0000 (18:23 +0200)
committerThomas Haller <thaller@redhat.com>
Sun, 20 Jul 2014 16:33:17 +0000 (18:33 +0200)
http://lists.infradead.org/pipermail/libnl/2014-June/001503.html

Signed-off-by: Thomas Haller <thaller@redhat.com>

Trivial merge