]> git.ipfire.org Git - thirdparty/nftables.git/commitdiff
projects / thirdparty / nftables.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ebd70e5 35f689e)
Merge branch 'master' into next-3.14
authorPablo Neira Ayuso <pablo@netfilter.org>
Mon, 3 Feb 2014 18:54:07 +0000 (19:54 +0100)
committerPablo Neira Ayuso <pablo@netfilter.org>
Mon, 3 Feb 2014 18:54:07 +0000 (19:54 +0100)
1  2 
src/mnl.c patch | diff1 | diff2 | blob | history

diff --cc src/mnl.c
Simple merge
Mirror of git://git.netfilter.org/nftables