Jan Engelhardt c15f1c8325 netfilter: ipset: use NFPROTO_ constants ...

ipset is actually using NFPROTO values rather than AF (xt_set passes
that along).

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

2012-03-07 17:40:29 +01:00

..

acpi

Merge branches 'atomicio-apei', 'hotplug', 'sony-nvs-nosave' and 'thermal-netlink' into release

2012-01-23 19:47:06 -05:00

asm-generic

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2012-03-05 21:16:26 -05:00

crypto

crypto: serpent-sse2 - add lrw support

2011-11-21 16:13:24 +08:00

drm

drm/exynos: exynos_drm.h header file fixes

2012-02-15 10:29:12 +09:00

keys

keys: add a "logon" key type

2012-01-17 22:39:40 -06:00

linux

netfilter: ipset: use NFPROTO_ constants

2012-03-07 17:40:29 +01:00

math-emu

…

media

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

2012-01-18 12:53:54 -08:00

misc

[media] altera-stapl: it is time to move out from staging

2011-09-23 15:00:57 -03:00

mtd

mtd: document that MEMWRITE ioctl is NAND-specific

2012-01-09 18:18:36 +00:00

net

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

2012-03-05 15:05:54 -05:00

pcmcia

pcmcia: add PCMCIA_DEVICE_MANF_CARD_PROD_ID3

2011-08-08 16:04:11 -04:00

rdma

rdma/core: Fix sparse warnings

2012-01-04 09:17:45 -08:00

rxrpc

atomic: use <linux/atomic.h>

2011-07-26 16:49:47 -07:00

scsi

[SCSI] libfc: Declare local functions static

2012-01-16 12:45:48 +04:00

sound

Merge branch 'fix/asoc' into for-linus

2012-01-31 15:13:14 +01:00

target

target: Change target_submit_cmd() to return void

2012-02-07 06:41:04 +00:00

trace

sched/events: Revert trace_sched_stat_sleeptime()

2012-02-22 12:06:55 +01:00

video

Merge tag 'fbdev-fixes-for-3.3-1' of git://github.com/schandinat/linux-2.6

2012-02-07 15:54:02 -08:00

xen

Merge branch 'for-3.3/drivers' of git://git.kernel.dk/linux-block

2012-01-15 12:48:41 -08:00

Kbuild

…