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
..
acpi	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux	2015-02-19 11:28:36 -08:00
asm-generic	OK, this has the big virtio 1.0 implementation, as specified by OASIS.	2015-02-18 09:24:01 -08:00
clocksource
crypto	crypto: af_alg - Allow to link sgl	2015-03-23 16:41:37 -04:00
drm	drm/ttm: device address space != CPU address space	2015-03-05 09:04:39 +10:00
dt-bindings	ARM: dts: am43xx: fix SLEWCTRL_FAST pinctrl binding	2015-03-06 09:21:03 -08:00
keys
kvm	arm/arm64: KVM: Keep elrsr/aisr in sync with software model	2015-03-14 13:42:07 +01:00
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-04-02 16:16:53 -04:00
math-emu
media
memory
misc
net	ipip,gre,vti,sit: implement ndo_get_iflink	2015-04-02 14:05:00 -04:00
pcmcia
ras
rdma
rxrpc
scsi	Merge branch 'for-3.20/core' of git://git.kernel.dk/linux-block	2015-02-12 14:13:23 -08:00
soc	pm: at91: Workaround DDRSDRC self-refresh bug with LPDDR1 memories.	2015-03-03 19:43:59 +01:00
sound
target	target: do not reject FUA CDBs when write cache is enabled but emulate_write_cache is 0	2015-03-19 23:26:46 -07:00
trace	regmap: introduce regmap_name to fix syscon regmap trace events	2015-03-19 20:04:55 +00:00
uapi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-04-02 16:16:53 -04:00
video	OMAPDSS: fix regression with display sysfs files	2015-02-26 10:23:15 +02:00
xen	xen: Remove trailing semicolon from xenbus_register_frontend() definition	2015-03-02 10:38:59 +00:00
Kbuild