Merge branch 'ipset'

diff --cc extensions/Kbuild
index 540699b3ccca179ac0d8a69993d4662d75981ed2,3f032f65a6ca8a6ae9d94384bddbbd770a90847f..e5c01e443a3ac77ec0acac356cd2a1c22b98c9fc
--- 1/extensions/Kbuild
--- 2/extensions/Kbuild
+++ b/extensions/Kbuild
@@@ -15,8 -15,7 +15,9 @@@ obj-${build_TEE}     += xt_TEE.
  obj-${build_condition} += xt_condition.o
  obj-${build_geoip}    += xt_geoip.o
  obj-${build_ipp2p}    += xt_ipp2p.o
+ obj-${build_ipset}    += ipset/
  obj-${build_portscan} += xt_portscan.o
 +obj-${build_quota2}    += xt_quota2.o
  
  -include ${M}/*.Kbuild
 +-include ${M}/Kbuild.*

diff --cc mconfig
index a68d4c46e97e8c49fb446383d2f4f4c0afdb6bf0,043a8ea36b2af21a73726b27c8fc426bd5e62636..8d8fcdcb6412718c8867f5a33e1825db1a85dca4
--- 1/mconfig
--- 2/mconfig
+++ b/mconfig
@@@ -10,5 -10,5 +10,6 @@@ build_TEE=
  build_condition=m
  build_geoip=m
  build_ipp2p=m
+ build_ipset=m
  build_portscan=m
 +build_quota2=m