David S. Miller b633353115 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/phy/bcm7xxx.c drivers/net/phy/marvell.c drivers/net/vxlan.c All three conflicts were cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-02-23 00:09:14 -05:00
..
boot	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-02-23 00:09:14 -05:00
configs	arm64: defconfig: updates for 4.5	2016-01-26 11:24:41 +00:00
crypto	arm/arm64: crypto: assure that ECB modes don't require an IV	2016-02-15 15:48:29 +00:00
include	KVM/ARM fixes:	2016-02-16 10:50:46 -08:00
kernel	arm64/efi: Make strnlen() available to the EFI namespace	2016-02-16 10:32:10 +00:00
kvm	arm64: KVM: Configure TCR_EL2.PS at runtime	2016-02-11 13:16:47 +00:00
lib	arm64/efi: Make strnlen() available to the EFI namespace	2016-02-16 10:32:10 +00:00
mm	arm64: mm: allow the kernel to handle alignment faults on user accesses	2016-02-19 12:20:37 +00:00
net	arm64: bpf: add extra pass to handle faulty codegen	2016-01-17 19:15:26 -05:00
xen	xen/arm: introduce HYPERVISOR_platform_op on arm and arm64	2015-12-21 14:40:56 +00:00
Kconfig	dma-mapping: always provide the dma_map_ops based implementation	2016-01-20 17:09:18 -08:00
Kconfig.debug	arch: consolidate CONFIG_STRICT_DEVM in lib/Kconfig.debug	2016-01-09 06:30:49 -08:00
Kconfig.platforms	ARM: SoC support for Tegra platforms for v4.5	2016-01-22 17:30:52 -08:00
Makefile	arm64: kbuild: make "make install" not depend on vmlinux	2016-02-19 10:33:35 +00:00