David S. Miller 26440c835f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/usb/asix_common.c net/ipv4/inet_connection_sock.c net/switchdev/switchdev.c In the inet_connection_sock.c case the request socket hashing scheme is completely different in net-next. The other two conflicts were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-10-20 06: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	arm64: compat: wire up new syscalls	2015-10-14 13:51:41 +01:00
kernel	arm64: replace read_lock to rcu lock in call_break_hook	2015-10-06 19:10:28 +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: readahead: fault retry breaks mmap file read random detection	2015-10-05 16:30:50 +01:00
net	ebpf: migrate bpf_prog's flags to bitfield	2015-10-03 05:02:39 -07: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: use KBUILD_CFLAGS_MODULE for erratum #843419	2015-10-12 17:40:12 +01:00