netfilter: ipset: hash:mac type added to ipset

Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>

diff --cc net/netfilter/ipset/Kconfig
Simple merge

diff --cc net/netfilter/ipset/Makefile
Simple merge

diff --cc net/netfilter/ipset/ip_set_hash_gen.h
Simple merge

diff --cc net/netfilter/ipset/ip_set_hash_mac.c
Simple merge