]> git.ipfire.org Git - thirdparty/nftables.git/commitdiff
Merge remote-tracking branch 'origin/master' into next-4.1
authorPatrick McHardy <kaber@trash.net>
Tue, 2 Jun 2015 11:03:33 +0000 (13:03 +0200)
committerPatrick McHardy <kaber@trash.net>
Tue, 2 Jun 2015 11:03:33 +0000 (13:03 +0200)
1  2 
src/netlink_delinearize.c
src/netlink_linearize.c

Simple merge
Simple merge