netfilter: xtables: merge xt_CONNMARK into xt_connmark
authorJan Engelhardt <jengelh@medozas.de>
Fri, 26 Feb 2010 13:20:32 +0000 (14:20 +0100)
committerPatrick McHardy <kaber@trash.net>
Wed, 17 Mar 2010 14:48:36 +0000 (15:48 +0100)
commitb8f00ba27e4acc4a2224360ce3aa8a22354434c5
tree60b9e536bc19ba6d4ddacd4bac5ebec1da9dc1d7
parent28b949885f80efb87d7cebdcf879c99db12c37bd
netfilter: xtables: merge xt_CONNMARK into xt_connmark

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
include/linux/netfilter/xt_CONNMARK.h
include/linux/netfilter/xt_connmark.h
net/netfilter/Kconfig
net/netfilter/Makefile
net/netfilter/xt_CONNMARK.c [deleted file]
net/netfilter/xt_connmark.c