]> git.ipfire.org Git - thirdparty/nftables.git/commit
Merge remote-tracking branch 'origin/master' into next-3.14
authorPatrick McHardy <kaber@trash.net>
Wed, 15 Jan 2014 15:45:02 +0000 (15:45 +0000)
committerPatrick McHardy <kaber@trash.net>
Wed, 15 Jan 2014 15:45:02 +0000 (15:45 +0000)
commitd357cdd882cc0cf6afb15686834f5d9d6efab57f
tree0c84af11c55111d8ee2d6185d5146ba637a87f58
parent75d2e1e6e90b087ea48f0cf0ea23a8a566d94537
parentc3d233b1e210922ac6f29afca796b66964e499de
Merge remote-tracking branch 'origin/master' into next-3.14

Signed-off-by: Patrick McHardy <kaber@trash.net>
Conflicts:
include/nftables.h
src/main.c
include/nftables.h
src/main.c