]> git.ipfire.org Git - thirdparty/nftables.git/commitdiff
Merge branch 'next-4.1'
authorPablo Neira Ayuso <pablo@netfilter.org>
Thu, 4 Jun 2015 18:57:20 +0000 (20:57 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Thu, 4 Jun 2015 18:57:20 +0000 (20:57 +0200)
1  2 
src/netlink_delinearize.c
src/netlink_linearize.c

Simple merge
Simple merge