David S. Miller 909b27f706 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The nf_conntrack_core.c fix in 'net' is not relevant in 'net-next' because we no longer have a per-netns conntrack hash. The ip_gre.c conflict as well as the iwlwifi ones were cases of overlapping changes. Conflicts: drivers/net/wireless/intel/iwlwifi/mvm/tx.c net/ipv4/ip_gre.c net/netfilter/nf_conntrack_core.c Signed-off-by: David S. Miller <davem@davemloft.net>		2016-05-15 13:32:48 -04:00
..
boot	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-05-09 15:59:24 -04:00
configs	arm64: defconfig: updates for 4.6	2016-03-29 16:56:00 +01:00
crypto	Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2016-03-17 11:22:54 -07:00
include	KVM/ARM Fixes for v4.6-rc4	2016-04-08 14:17:27 +02:00
kernel	arm64: Fix EL1/EL2 early init inconsistencies with VHE	2016-04-21 18:34:23 +01:00
kvm	arm64: KVM: Warn when PARange is less than 40 bits	2016-04-06 13:33:14 +02:00
lib	arm64 updates for 4.6:	2016-03-17 20:03:47 -07:00
mm	2nd set of arm64 updates for 4.6:	2016-03-24 19:13:59 -07:00
net	arm64: bpf: jit JMP_JSET_{X,K}	2016-05-14 16:11:45 -04:00
xen	xen/arm: introduce HYPERVISOR_platform_op on arm and arm64	2015-12-21 14:40:56 +00:00
Kconfig	arm64 updates for 4.6:	2016-03-17 20:03:47 -07:00
Kconfig.debug	arm64: enable CONFIG_DEBUG_RODATA by default	2016-03-03 18:14:17 +00:00
Kconfig.platforms	arm64/sunxi: 4.6-rc1: Add dependency on generic irq chip	2016-05-10 21:43:32 +02:00
Makefile	arm64 updates for 4.6:	2016-03-17 20:03:47 -07:00