1
0
Fork 0
remarkable-linux/arch/arm64
David S. Miller 4963ed48f2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	net/ipv4/arp.c

The net/ipv4/arp.c conflict was one commit adding a new
local variable while another commit was deleting one.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-26 16:08:27 -07:00
..
boot Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-09-26 16:08:27 -07:00
configs arm64: Enable Marvell Berlin SoC family in defconfig 2015-08-06 10:15:57 +02:00
crypto crypto: aead - Remove CRYPTO_ALG_AEAD_NEW flag 2015-08-17 16:53:53 +08:00
include AMD fixes for bugs introduced in the 4.2 merge window, 2015-09-25 10:51:40 -07:00
kernel arm64: errata: add module build workaround for erratum #843419 2015-09-17 11:57:03 +01:00
kvm Second set of KVM/ARM changes for 4.3-rc2 2015-09-17 16:51:59 +02:00
lib arm64: atomics: prefetch the destination word for write prior to stxr 2015-07-27 15:28:53 +01:00
mm arm64: dma-mapping: check whether cma area is initialized or not 2015-09-14 12:28:30 +01:00
net arm64: bpf: fix endianness conversion bugs 2015-06-26 14:15:39 +01:00
xen arm: xen: implement multicall hypercall support. 2014-04-24 13:09:46 +01:00
Kconfig arm64: errata: add module build workaround for erratum #843419 2015-09-17 11:57:03 +01:00
Kconfig.debug coresight: moving to new "hwtracing" directory 2015-04-03 16:17:04 +02:00
Kconfig.platforms arm64: Enable Marvell Berlin SoC family in Kconfig 2015-08-06 10:15:01 +02:00
Makefile arm64: errata: add module build workaround for erratum #843419 2015-09-17 11:57:03 +01:00