David S. Miller 0ddead90b2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The conflicts were two cases of overlapping changes in batman-adv and the qed driver. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-06-15 11:59:32 -04:00
..
boot	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-06-15 11:59:32 -04:00
configs	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-06-15 11:59:32 -04:00
crypto	Revert "crypto: arm64/sha - Add constant operand modifier to ASM_EXPORT"	2017-04-24 16:09:50 +08:00
include	KVM/ARM Fixes for v4.12-rc5 - Take 2	2017-06-08 15:04:38 +02:00
kernel	ARM64: PCI: Fix struct acpi_pci_root_ops allocation failure path	2017-05-25 16:52:58 +01:00
kvm	arm64: KVM: Allow unaligned accesses at EL2	2017-06-06 22:20:02 +02:00
lib	arm64: switch to RAW_COPY_USER	2017-03-28 18:23:24 -04:00
mm	IOMMU Updates for Linux v4.12	2017-05-09 15:15:47 -07:00
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-06-15 11:59:32 -04:00
xen	xen/privcmd: Add IOCTL_PRIVCMD_DM_OP	2017-02-14 15:13:43 -05:00
Kconfig	security/keys: add CONFIG_KEYS_COMPAT to Kconfig	2017-06-09 13:29:45 +10:00
Kconfig.debug	arm64: relocation testing module	2017-04-04 17:03:32 +01:00
Kconfig.platforms	mvebu arm64 for 4.12	2017-05-10 15:36:43 +02:00
Makefile	Kbuild misc updates for 4.12	2017-05-10 20:41:43 -07:00