summaryrefslogtreecommitdiffstats
path: root/include/linux/netfilter/ipset/ip_set.h
diff options
context:
space:
mode:
authorJan Engelhardt <jengelh@inai.de>2012-09-30 23:34:04 +0200
committerJan Engelhardt <jengelh@inai.de>2012-09-30 23:38:58 +0200
commit4c1a015e201c6e5192448cbcf1975dd7630cad82 (patch)
tree30ee606da82b0cbcb11ebb303196afb29f4e65e7 /include/linux/netfilter/ipset/ip_set.h
parentec40b897289745da3d67de2cb14be30353003922 (diff)
parent7b5ba43ae48c1310e5a615cf9485c1d42f486467 (diff)
Merge branch 'master' of git://git.inai.de/iptables
Conflicts: extensions/GNUmakefile.in Resolution: trivial, since this was a fuzz 3. Reason: Line added from v1.4.15-16-g33710a5 was in vincinity of changes from v1.4.15-22-g4496801.
Diffstat (limited to 'include/linux/netfilter/ipset/ip_set.h')
0 files changed, 0 insertions, 0 deletions