David S. Miller 9f0d34bc34 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/usb/asix_common.c drivers/net/usb/sr9800.c drivers/net/usb/usbnet.c include/linux/usb/usbnet.h net/ipv4/tcp_ipv4.c net/ipv6/tcp_ipv6.c The TCP conflicts were overlapping changes. In 'net' we added a READ_ONCE() to the socket cached RX route read, whilst in 'net-next' Eric Dumazet touched the surrounding code dealing with how mini sockets are handled. With USB, it's a case of the same bug fix first going into net-next and then I cherry picked it back into net. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-04-02 16:16:53 -04:00
..
boot	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-04-02 16:16:53 -04:00
configs	ARM: SoC 64-bit changes and additions	2015-02-17 09:47:46 -08:00
crypto	arm64: crypto: increase AES interleave to 4x	2015-02-26 18:31:46 +00:00
include	arm64: percpu: Make this_cpu accessors pre-empt safe	2015-03-24 18:02:55 +00:00
kernel	arm64: efi: don't restore TTBR0 if active_mm points at init_mm	2015-03-20 17:05:16 +00:00
kvm	Fairly small update, but there are some interesting new features.	2015-02-13 09:55:09 -08:00
lib	arm64: __clear_user: handle exceptions on strb	2014-11-13 15:21:26 +00:00
mm	arm64: Honor __GFP_ZERO in dma allocations	2015-03-20 18:18:54 +00:00
net	arm64: bpf: lift restriction on last instruction	2014-12-03 18:04:09 +00:00
xen	arm: xen: implement multicall hypercall support.	2014-04-24 13:09:46 +01:00
Kconfig	ARM: SoC 64-bit changes and additions	2015-02-17 09:47:46 -08:00
Kconfig.debug	arm64: add better page protections to arm64	2015-01-22 14:54:29 +00:00
Makefile	arm64 updates for 3.20:	2015-02-11 18:03:54 -08:00