WANG Cong 6c80563c2f net_sched: act: pick a different type for act_xt ... In tcf_register_action() we check either ->type or ->kind to see if there is an existing action registered, but ipt action registers two actions with same type but different kinds. They should have different types too. Cc: Jamal Hadi Salim <jhs@mojatatu.com> Cc: David S. Miller <davem@davemloft.net> Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com> Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com> Signed-off-by: David S. Miller <davem@davemloft.net>		2014-01-16 17:24:11 -08:00
..
acpi	Merge branches 'acpi-pci-pm' and 'acpi-pci-hotplug'	2013-12-31 22:03:37 +01:00
asm-generic	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-01-06 17:37:45 -05:00
clocksource
crypto	crypto: scatterwalk - Use sg_chain_ptr on chain entries	2013-12-09 19:58:52 +08:00
drm	drm/radeon: 0x9649 is SUMO2 not SUMO	2013-12-23 10:03:41 -05:00
dt-bindings	For the 3.13 merge window we have a couple of new drivers for the AMS	2013-11-15 16:37:40 -08:00
keys
kvm
linux	net: add NETDEV_PRECHANGEMTU to notify before mtu change happens	2014-01-16 17:15:41 -08:00
math-emu
media	[media] videobuf2: Add support for file access mode flags for DMABUF exporting	2013-12-09 14:50:50 -02:00
memory
misc
net	neigh: use NEIGH_VAR_INIT in ndo_neigh_setup functions.	2014-01-16 11:31:58 -08:00
pcmcia
ras
rdma	IB/core: const'ify inbuf in struct ib_udata	2013-12-16 10:38:28 -08:00
rxrpc
scsi	[SCSI] Disable WRITE SAME for RAID and virtual host adapter drivers	2013-11-29 08:48:39 +04:00
sound	ALSA: memalloc.h - fix wrong truncation of dma_addr_t	2013-12-10 15:30:46 +01:00
target	target/file: Update hw_max_sectors based on current block_size	2013-12-19 00:18:54 -08:00
trace	net: Add trace events for all receive entry points, exposing more skb fields	2014-01-14 14:46:02 -08:00
uapi	net_sched: act: pick a different type for act_xt	2014-01-16 17:24:11 -08:00
video	fbdev changes for 3.13	2013-11-14 14:44:20 +09:00
xen	Bug-fixes:	2013-12-20 09:34:54 -08:00
Kbuild