David S. Miller 6abdd5f593 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... All three conflicts were cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-08-30 00:54:02 -04:00
..
boot	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-08-18 01:17:32 -04:00
configs	arm64: defconfig: enable CONFIG_LOCALVERSION_AUTO	2016-08-12 19:08:48 +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	arm64 fixes:	2016-08-13 19:29:46 -07:00
kernel	arm64: avoid TLB conflict with CONFIG_RANDOMIZE_BASE	2016-08-25 11:11:32 +01:00
kvm	arm64: KVM: report configured SRE value to 32-bit world	2016-08-17 12:46:23 +02:00
lib	arm64/uaccess: Enable hardened usercopy	2016-07-26 14:41:49 -07:00
mm	arm64: Fix shift warning in arch/arm64/mm/dump.c	2016-08-18 12:38:11 +01:00
net	arm64: bpf: optimize LD_ABS, LD_IND	2016-06-10 23:11:50 -07:00
xen	arm/xen: add support for vm_assist hypercall	2016-07-06 10:42:14 +01:00
Kconfig	Implements HARDENED_USERCOPY verification of copy_to_user/copy_from_user	2016-08-08 14:48:14 -07:00
Kconfig.debug	arm64: enable CONFIG_SET_MODULE_RONX by default	2016-05-31 14:23:29 +01:00
Kconfig.platforms	arm64: Kconfig: select HISILICON_IRQ_MBIGEN only if PCI is selected	2016-08-10 22:58:12 +02:00
Makefile	arm64 fixes:	2016-08-06 08:58:59 -04:00